From 9f67a5f87dca49e79a7cc2be0b79f4bf628bd188 Mon Sep 17 00:00:00 2001 From: Michael Hackstein Date: Fri, 7 Mar 2014 11:49:12 +0100 Subject: [PATCH] SCSS-Lint --- .../aardvark/frontend/scss/_dashboard.scss | 12 +-- .../frontend/scss/_dashboardDistribution.scss | 11 +-- .../frontend/scss/_dashboardHttpGroup.scss | 77 ++++++++++--------- .../aardvark/frontend/scss/_dbSelection.scss | 10 +-- .../aardvark/frontend/scss/_dropdowns.scss | 77 ++++++++++--------- .../system/aardvark/frontend/scss/_fonts.scss | 7 +- .../aardvark/frontend/scss/_footer.scss | 6 +- .../aardvark/frontend/scss/_headerBar.scss | 20 ++--- .../system/aardvark/frontend/scss/_icons.scss | 6 +- 9 files changed, 119 insertions(+), 107 deletions(-) diff --git a/js/apps/system/aardvark/frontend/scss/_dashboard.scss b/js/apps/system/aardvark/frontend/scss/_dashboard.scss index 38d0ab9131..8d4a61a4ad 100644 --- a/js/apps/system/aardvark/frontend/scss/_dashboard.scss +++ b/js/apps/system/aardvark/frontend/scss/_dashboard.scss @@ -1,12 +1,12 @@ .dashboardModal { $width: 90%; @extend %pull-left; - min-width: 780px; - width: $width; - margin-left: -$width/2; - overflow: auto; - height: 80%; - top: 10%; @include border-radius(8px !important); //.modal has it + + height: 80%; + margin-left: -$width/2; + min-width: 780px; + overflow: auto; padding: 10px; + top: 10%; } diff --git a/js/apps/system/aardvark/frontend/scss/_dashboardDistribution.scss b/js/apps/system/aardvark/frontend/scss/_dashboardDistribution.scss index a5d0d94c1b..6cc453656b 100644 --- a/js/apps/system/aardvark/frontend/scss/_dashboardDistribution.scss +++ b/js/apps/system/aardvark/frontend/scss/_dashboardDistribution.scss @@ -1,9 +1,10 @@ .dashboardDistribution { - width: 270px; float: left; + width: 270px; + + svg { + height: 220px; + width: 250px; + } } -.dashboardDistribution svg { - width: 250px; - height: 220px; -} diff --git a/js/apps/system/aardvark/frontend/scss/_dashboardHttpGroup.scss b/js/apps/system/aardvark/frontend/scss/_dashboardHttpGroup.scss index 647892424c..f59449206f 100644 --- a/js/apps/system/aardvark/frontend/scss/_dashboardHttpGroup.scss +++ b/js/apps/system/aardvark/frontend/scss/_dashboardHttpGroup.scss @@ -1,74 +1,75 @@ #dashboardHttpGroup { - width: 100%; + border: 1px solid $c-black; height: 100%; - border: 1px solid $c_black; + width: 100%; } #dashboardDetailedChart { - width: 100%; + border: 1px solid $c-black; height: 300px; - border: 1px solid $c_black; + width: 100%; } .innerDashboardChart { + bottom: 5px; + left: 5px; position: absolute; - top : 5px; - left : 5px; - right : 5px; - bottom : 5px; + right: 5px; + top: 5px; } -#distributionChartDiv { +#distributionChartDiv { @extend %clear-float; } -.lineChartDiv { + +.lineChartDiv { @extend %clear-float; } .dashboardChart { - background-color: $c_white; + background-color: $c-white; + border: 1px solid $c-semi-transp; + float: left; + height: 210px; + margin: 1.05%; position: relative; width: 31%; - height: 210px; - border: 1px solid rgba(0, 0, 0, 0.2); - float: left; - margin: 1.05%; - // padding: 0px; } .dygraph-label.dygraph-title { - font-size: 15px; - font-weight: 400; - font-family: 'Open Sans', sans-serif; + color: $c-black; + font: { + family: 'Open Sans', sans-serif; + size: 15px; + weight: 400; + } text-align: left; - // font-variant: small-caps; - color: $c_black; } -.dygraph-axis-label.dygraph-axis-label-x { - font-size: 12px; - font-weight: 400; - font-family: 'Open Sans', sans-serif; - color: $c_darker_grey; -} +.dygraph-axis-label { -.dygraph-axis-label.dygraph-axis-label-y { - // width: 35px; - font-size: 12px; - font-weight: 400; - font-family: 'Open Sans', sans-serif; - color: $c_darker_grey; + &.dygraph-axis-label-x, + &.dygraph-axit-label-y { + color: $c-darker-grey; + font: { + family: 'Open Sans', sans-serif; + size: 12px; + weight: 400; + } + } } .dygraph-legend { background-color: #fafafa !important; + color: $c-darker-grey !important; + font: { + family: 'Open Sans', sans-serif !important; + size: 12px !important; + weight: 400 !important; + } text-align: right !important; - font-size: 12px !important; - font-weight: 400 !important; - font-family: 'Open Sans', sans-serif !important; - color: $c_darker_grey !important; } #dashboardDetailedLineChart { padding-top: 10px -;} \ No newline at end of file +;} diff --git a/js/apps/system/aardvark/frontend/scss/_dbSelection.scss b/js/apps/system/aardvark/frontend/scss/_dbSelection.scss index 88ebd3190b..c9e2ea9776 100644 --- a/js/apps/system/aardvark/frontend/scss/_dbSelection.scss +++ b/js/apps/system/aardvark/frontend/scss/_dbSelection.scss @@ -1,8 +1,8 @@ .dbselection { - text-overflow: ellipsis; - white-space: nowrap; - overflow: hidden; - max-width: 160px; float: left; margin-right: 3px; -} \ No newline at end of file + max-width: 160px; + overflow: hidden; + text-overflow: ellipsis; + white-space: nowrap; +} diff --git a/js/apps/system/aardvark/frontend/scss/_dropdowns.scss b/js/apps/system/aardvark/frontend/scss/_dropdowns.scss index 8e1dbca30b..4deadd9abb 100644 --- a/js/apps/system/aardvark/frontend/scss/_dropdowns.scss +++ b/js/apps/system/aardvark/frontend/scss/_dropdowns.scss @@ -1,30 +1,31 @@ div.headerDropdown { - background-color: $c_white; - position:relative; - display:none; + background-color: $c-white; + display: none; padding: 10px; + position: relative; width: auto; & > div.dropdownInner { - position: relative; + @include box-shadow(0); min-height: 125px; + position: relative; width: auto; - box-shadow: 0; } &.headerDropdown input[type=checkbox].css-checkbox { - display:none; + display: none; & + label.css-label { @extend %clickable; - padding-left:20px; - margin-top: 0px; - height:15px; - display:inline-block; - background-repeat:no-repeat; + background-position: 0 0; - font-size:15px; - vertical-align:middle; + background-repeat: no-repeat; + display: inline-block; + font-size: 15px; + height: 15px; + margin-top: 0; + padding-left: 20px; + vertical-align: middle; } &:checked + label.css-label { @@ -34,68 +35,72 @@ div.headerDropdown { } div.queryline { - color: $c_black; + color: $c-black; height: 35px; - select, input { + select, + input { margin-bottom: 5px; } &.querylineAdd span { + color: $c-white; + padding-left: 10px; position: relative; top: -21px; - color: $c_white; - padding-left: 10px; } .removeFilterItem i { - margin-top: 0px !important; margin-left: 5px !important; + margin-top: 0 !important; } div.searchByAttribute { position: relative; & > ul.gv-dropdown-menu { - position: absolute; - border-radius: 0px; - top: 20px; - left: 0px; - width: 247px; - background-color: $c_nav_bg; - color: $c_white; + @include border-radius(0); + + background-color: $c-nav-bg; + color: $c-white; display: none; + left: 0; + position: absolute; + top: 20px; + width: 247px; } } } div.dropdownImport { - display:none; - background-color: $c_white; - padding-top: 10px; - padding-left: 10px; - padding-right: 10px; - padding-bottom: 5px; - position:relative; + background-color: $c-white; + display: none; + padding: { + top: 10px; + left: 10px; + right: 10px; + bottom: 5px; + } + position: relative; input { - line-height: 0px; - margin-top: 5px; + line-height: 0; margin-bottom: -15px; + margin-top: 5px; } } select.filterSelect { - width: 100px; margin-left: 10px; margin-right: 10px; + width: 100px; } //TODO Le fix #filterHeader button { float: right; - margin-top: 1px; margin-left: 10px !important; + margin-top: 1px; } diff --git a/js/apps/system/aardvark/frontend/scss/_fonts.scss b/js/apps/system/aardvark/frontend/scss/_fonts.scss index d87922043b..59881512fb 100644 --- a/js/apps/system/aardvark/frontend/scss/_fonts.scss +++ b/js/apps/system/aardvark/frontend/scss/_fonts.scss @@ -1,5 +1,8 @@ -body, input, textarea, .page-title span, .pingback a.url { - /*font-family: "Helvetica",sans-serif;*/ +body, +input, +textarea, +.page-title span, +.pingback a.url { font-family: 'Open Sans', sans-serif !important; font-weight: 400; } diff --git a/js/apps/system/aardvark/frontend/scss/_footer.scss b/js/apps/system/aardvark/frontend/scss/_footer.scss index 3d6ccc4fdf..886fed913d 100644 --- a/js/apps/system/aardvark/frontend/scss/_footer.scss +++ b/js/apps/system/aardvark/frontend/scss/_footer.scss @@ -1,12 +1,12 @@ footer.footer { @extend %fixedbar; - bottom: 0px; + bottom: 0; height: 40px; p { - padding-top: 10px; + margin-bottom: 0; padding-bottom: 10px; - margin-bottom:0; + padding-top: 10px; } } diff --git a/js/apps/system/aardvark/frontend/scss/_headerBar.scss b/js/apps/system/aardvark/frontend/scss/_headerBar.scss index 9623a3befd..9f49bbfa9c 100644 --- a/js/apps/system/aardvark/frontend/scss/_headerBar.scss +++ b/js/apps/system/aardvark/frontend/scss/_headerBar.scss @@ -1,30 +1,30 @@ // The bar on top of each page div.headerBar { - position: relative; - margin-bottom: 5px; - background-color: $c_bar_bg; - color: $c_white; - height: 36px; + background-color: $c-bar-bg; + color: $c-white; font-size: 16px; + height: 36px; + margin-bottom: 5px; padding-left: 5px; padding-right: 5px; + position: relative; } // The title of the page div.headerBar a.arangoHeader, .modal-header .arangoHeader { - color: $c_white; + color: $c-white; + font-size: 16px; + left: 5px; position: relative; top: 7px; - left: 5px; - font-size: 16px; } // The buttons on the right side div.headerBar > div.headerButtonBar { - margin: 4px 0px; + margin: 4px 0; margin-bottom: 0 !important; } @@ -36,7 +36,7 @@ div.headerBar > div.breadcrumb { // Disabled breadcrumb div.breadcrumb a.disabledBread { - color: $c_white; + color: $c-white; } // arangoHeader diff --git a/js/apps/system/aardvark/frontend/scss/_icons.scss b/js/apps/system/aardvark/frontend/scss/_icons.scss index 23367b5c04..708f3aea42 100644 --- a/js/apps/system/aardvark/frontend/scss/_icons.scss +++ b/js/apps/system/aardvark/frontend/scss/_icons.scss @@ -1,16 +1,18 @@ .clusterInfoIcon { float: left; - padding-top: 2px; padding-left: 5px; + padding-top: 2px; } .waitModal { text-align: center; + &.icon { font-size: 100px; height: 120px; } + &.message { font-size: 20px; } -} \ No newline at end of file +}