From dc8bc31be517a53e8fbe7100cfe45cd73f596de0 Mon Sep 17 00:00:00 2001 From: Chocobozzz Date: Mon, 14 Mar 2016 13:50:19 +0100 Subject: Angular application :first draft --- client/stylesheets/application.scss | 6 +-- client/stylesheets/bootstrap-variables.scss | 6 +-- client/stylesheets/index.scss | 83 ----------------------------- 3 files changed, 6 insertions(+), 89 deletions(-) (limited to 'client/stylesheets') diff --git a/client/stylesheets/application.scss b/client/stylesheets/application.scss index bf9ec90ab..d1b309907 100644 --- a/client/stylesheets/application.scss +++ b/client/stylesheets/application.scss @@ -1,6 +1,6 @@ -$icon-font-path: "/stylesheets/vendor/fonts/bootstrap/"; +$icon-font-path: "/app/node_modules/bootstrap-sass/assets/fonts/bootstrap/"; @import "bootstrap-variables"; @import "_bootstrap"; -@import "base"; -@import "index"; \ No newline at end of file +@import "base.scss"; +@import "index.scss"; diff --git a/client/stylesheets/bootstrap-variables.scss b/client/stylesheets/bootstrap-variables.scss index 5a49649f9..a2472f357 100644 --- a/client/stylesheets/bootstrap-variables.scss +++ b/client/stylesheets/bootstrap-variables.scss @@ -108,9 +108,9 @@ // $line-height-large: 1.3333333 // extra decimals for Win 8.1 Chrome // $line-height-small: 1.5 -$border-radius-base: 0; -$border-radius-large: 0; -$border-radius-small: 0; +// $border-radius-base: 0; +// $border-radius-large: 0; +// $border-radius-small: 0; //** Global color for active items (e.g., navs or dropdowns). // $component-active-color: #fff diff --git a/client/stylesheets/index.scss b/client/stylesheets/index.scss index d13dcfa90..5cba54705 100644 --- a/client/stylesheets/index.scss +++ b/client/stylesheets/index.scss @@ -1,88 +1,5 @@ -.span_action { - margin: 5px; - cursor: pointer; -} - header div { height: 50px; line-height: 25px; margin-bottom: 50px; } - -menu { - margin-right: 20px; - border-right: 1px solid rgba(0, 0, 0, 0.2); -} - -menu .panel_button { - margin: 8px; - cursor: pointer; - transition: margin 0.2s; -} - -menu .panel_button:hover { - margin-left: 15px; -} - -menu .glyphicon { - margin: 5px; -} - -#ajax_load { - min-height: 500px; -} - -.loading { - display: inline-block; - margin-top: 100px; -} - -.video { - margin-bottom: 10px; - transition: margin 0.5s ease; -} - -.video:hover { - margin-left: 5px; -} - -.video_name { - cursor: pointer; - margin-right: 5px; -} - -.video_pod_url { - font-size: small; - color: rgba(0, 0, 0, 0.5); -} - -.video_description { - font-size: small; - font-style: italic; - margin-left: 7px; -} - -.btn-file { - position: relative; - overflow: hidden; -} -.btn-file input[type=file] { - position: absolute; - top: 0; - right: 0; - min-width: 100%; - min-height: 100%; - font-size: 100px; - text-align: right; - filter: alpha(opacity=0); - opacity: 0; - outline: none; - background: white; - cursor: inherit; - display: block; -} - -.name_file { - display: inline-block; - margin-left: 10px; -} \ No newline at end of file -- cgit v1.2.3