diff options
author | Christopher Speller <crspeller@gmail.com> | 2016-03-17 08:36:53 -0400 |
---|---|---|
committer | Christopher Speller <crspeller@gmail.com> | 2016-03-17 08:36:53 -0400 |
commit | be07d634645ac1f095f7d4bec182a604075c6138 (patch) | |
tree | 8d2f59791d2d418b93e4fff227fef2405be7dfd0 /webapp/sass/routes | |
parent | cba59d4eb6ef0f65304bc72339c676ebfd653e2b (diff) | |
parent | 64321f88f358e23489559d675b9194f856c0175c (diff) | |
download | chat-be07d634645ac1f095f7d4bec182a604075c6138.tar.gz chat-be07d634645ac1f095f7d4bec182a604075c6138.tar.bz2 chat-be07d634645ac1f095f7d4bec182a604075c6138.zip |
Merge pull request #2448 from asaadmahmoodspin/ui-improvements
Updating sass lint stuff with other scss improvements
Diffstat (limited to 'webapp/sass/routes')
-rw-r--r-- | webapp/sass/routes/_access-history.scss | 6 | ||||
-rw-r--r-- | webapp/sass/routes/_activity-log.scss | 22 | ||||
-rw-r--r-- | webapp/sass/routes/_admin-console.scss | 106 | ||||
-rw-r--r-- | webapp/sass/routes/_docs.scss | 6 | ||||
-rw-r--r-- | webapp/sass/routes/_error-page.scss | 12 | ||||
-rw-r--r-- | webapp/sass/routes/_loading.scss | 19 | ||||
-rw-r--r-- | webapp/sass/routes/_settings.scss | 189 | ||||
-rw-r--r-- | webapp/sass/routes/_signup.scss | 128 | ||||
-rw-r--r-- | webapp/sass/routes/_statistics.scss | 45 |
9 files changed, 288 insertions, 245 deletions
diff --git a/webapp/sass/routes/_access-history.scss b/webapp/sass/routes/_access-history.scss index 7ede7b085..ea66f5f00 100644 --- a/webapp/sass/routes/_access-history.scss +++ b/webapp/sass/routes/_access-history.scss @@ -2,9 +2,9 @@ .access-history__table { display: table; - width: 100%; - padding-top: 15px; line-height: 1.6; + padding-top: 15px; + width: 100%; &:first-child { padding: 0; @@ -16,8 +16,8 @@ } .access__date { - font-weight: 600; font-size: 15px; + font-weight: 600; width: 190px; } diff --git a/webapp/sass/routes/_activity-log.scss b/webapp/sass/routes/_activity-log.scss index 6e8d0a925..d3400e29a 100644 --- a/webapp/sass/routes/_activity-log.scss +++ b/webapp/sass/routes/_activity-log.scss @@ -1,36 +1,27 @@ @charset 'UTF-8'; -@keyframes highlight { - from { - background: rgba(yellow, .5); - } - to { - background: none; - } -} - .animation--highlight { &:before { - content: ''; animation: highlight 1.5s ease; + content: ''; + height: 100%; + left: 0; position: absolute; top: 0; - left: 0; width: 100%; - height: 100%; } } .activity-log__table { + border-top: 1px solid $light-gray; display: table; - width: 100%; line-height: 1.8; - border-top: 1px solid #ddd; padding: 15px 0; + width: 100%; &:first-child { - padding-top: 0; border: none; + padding-top: 0; } > div { @@ -49,6 +40,7 @@ .report__platform { font-size: 15px; font-weight: 600; + .fa { margin-right: 6px; } diff --git a/webapp/sass/routes/_admin-console.scss b/webapp/sass/routes/_admin-console.scss index f83ce487e..63cf8eb13 100644 --- a/webapp/sass/routes/_admin-console.scss +++ b/webapp/sass/routes/_admin-console.scss @@ -15,26 +15,25 @@ } h3 { - font-weight: 600; border-bottom: 1px solid #ddd; - padding-bottom: .5em; + font-weight: 600; margin: 1em 0; + padding-bottom: .5em; } .table { - background: #fff; + background: $white; } .form-control { - background-color: #fff; + background-color: $white; border: 1px solid #ccc; color: #555; &:focus { + @include box-shadow(inset 0 1px 1px rgba(0, 0, 0, .075), 0 0 8px rgba(102, 175, 233, .6)); border-color: #66afe9; outline: 0; - -webkit-box-shadow: inset 0 1px 1px rgba(0,0,0,.075),0 0 8px rgba(102,175,233,.6); - box-shadow: inset 0 1px 1px rgba(0,0,0,.075),0 0 8px rgba(102,175,233,.6); } } @@ -42,7 +41,7 @@ color: #333; &.btn-primary { - background: #2389d7; + background: $primary-color; &:hover, &:focus, @@ -53,7 +52,7 @@ } .dropdown-menu { - background: #fff; + background: $white; border: 1px solid rgba(0,0,0,.15); color: inherit; } @@ -86,38 +85,38 @@ > h4 { background: #333; - padding: 10px 10px; margin: 1px 0 0; + padding: 10px; .menu-icon--right { - top: 6px; right: 12px; + top: 6px; } } } .menu-icon--right { - position: absolute; - right: 10px; - top: 3px; font-size: 18px; font-weight: 600; - width: 20px; height: 20px; line-height: 20px; + position: absolute; + right: 10px; text-align: center; + top: 3px; + width: 20px; .fa { + color: $white; font-size: 13px; - right: -2px; position: relative; - color: #fff; + right: -2px; } } &.nav__sub-menu { + @include font-smoothing(initial); background: #111; - -webkit-font-smoothing: auto; &.padded { padding: 5px 0; @@ -125,30 +124,31 @@ li { > a { - font-size: 13px; - padding: 5px 35px 5px 15px; background: transparent; color: #bbb; + font-size: 13px; + padding: 5px 35px 5px 15px; &:hover { - color: lighten($color--primary, 10); + color: lighten($primary-color, 10); } &.active { - color: #fff; + color: $white; font-weight: 600; } } .nav-more { - font-size: 13px; - padding: 5px 15px; background: transparent; color: #bbb; - display: block; cursor: pointer; + display: block; + font-size: 13px; + padding: 5px 15px; + &:hover { - color: lighten($color--primary, 10); + color: lighten($primary-color, 10); } } } @@ -166,23 +166,23 @@ } .log__panel { - overflow: scroll; - width: 100%; - height: 800px; + background-color: white; border: 1px solid #ddd; + height: 800px; margin-top: 10px; + overflow: scroll; padding: 5px; - background-color: white; + width: 100%; } .app__content { color: #333; &.admin { - overflow: auto; background-color: #f1f1f1; - padding: 0 20px 20px; min-height: 600px; + overflow: auto; + padding: 0 20px 20px; } .wrapper--fixed { @@ -193,9 +193,9 @@ margin-top: 40px; .control-label { - text-align: left; - padding-right: 0; font-weight: 600; + padding-right: 0; + text-align: left; } .form-group { @@ -203,22 +203,25 @@ } .file__upload { - position: relative; - margin: 0 10px 10px 0; display: inline-block; + margin: 0 10px 10px 0; + position: relative; input { - position: absolute; @include opacity(0); - width: 100%; height: 100%; - z-index: 5; - top: 0; left: 0; + position: absolute; + top: 0; + width: 100%; + z-index: 5; } } .help-text { + color: #777; + margin: 10px 0 0 15px; + &.no-margin { margin: 0; } @@ -228,9 +231,6 @@ padding-left: 23px; } - margin: 10px 0 0 15px; - color: #777; - .help-link { margin-right: 5px; } @@ -242,10 +242,10 @@ .alert { display: inline-block; - padding: 5px 7px; margin: 1em 0 0; - top: 1px; + padding: 5px 7px; position: relative; + top: 1px; .fa { margin-right: 5px; @@ -254,11 +254,11 @@ } .banner { - background: #fff; + background: $white; border: 1px solid #ddd; - padding: .7em 1.5em; font-size: .95em; margin: 2em 0; + padding: .7em 1.5em; .banner__heading { font-size: 1.5em; @@ -275,19 +275,19 @@ .popover { border-radius: 3px; - width: 100%; font-size: .95em; + width: 100%; } .panel { - border: none; background-color: transparent; + border: none; } .panel-default { > .panel-heading { - padding: 10px 0; background-color: transparent; + padding: 10px 0; } .panel-body { @@ -304,9 +304,9 @@ line-height: 1.5; a { - text-decoration: none; - display: block; @include clearfix; + display: block; + text-decoration: none; &.collapsed { .fa-minus { @@ -319,10 +319,10 @@ } .fa { - font-size: 18px; + color: #aaa; float: right; + font-size: 18px; margin-top: 8px; - color: #aaa; } .fa-plus { diff --git a/webapp/sass/routes/_docs.scss b/webapp/sass/routes/_docs.scss index 24e96772b..9a205f8a2 100644 --- a/webapp/sass/routes/_docs.scss +++ b/webapp/sass/routes/_docs.scss @@ -5,15 +5,15 @@ padding-bottom: 20px; > div { - width: 1170px; margin: 0 auto; - padding: 0 15px; max-width: 100%; + padding: 0 15px; + width: 1170px; } h1.markdown__heading { border-bottom: 1px solid #ddd; - padding-bottom: 1rem; margin: 1em 0 1em; + padding-bottom: 1rem; } } diff --git a/webapp/sass/routes/_error-page.scss b/webapp/sass/routes/_error-page.scss index 8cd0716ca..438e60554 100644 --- a/webapp/sass/routes/_error-page.scss +++ b/webapp/sass/routes/_error-page.scss @@ -8,23 +8,23 @@ body { } .error__container { - max-width: 800px; - margin: 0 auto; + color: #555; display: table-cell; - vertical-align: top; + margin: 0 auto; + max-width: 800px; padding: 5em 0; text-align: left; - color: #555; + vertical-align: top; } .error__icon { - font-size: 4em; color: #ccc; + font-size: 4em; } h2 { - font-weight: 600; font-size: 1.5em; + font-weight: 600; margin: .8em 0 .5em; } diff --git a/webapp/sass/routes/_loading.scss b/webapp/sass/routes/_loading.scss index 8d6552957..39f37b1b3 100644 --- a/webapp/sass/routes/_loading.scss +++ b/webapp/sass/routes/_loading.scss @@ -4,32 +4,32 @@ .loading-screen { display: table; - width: 100%; height: 100%; padding: 60px; text-align: center; + width: 100%; .loading__content { display: table-cell; - vertical-align: middle; font-size: 0; + vertical-align: middle; h3 { + display: inline-block; font-size: 16px; font-weight: 400; - margin: 0 .2em 0; - display: inline-block; + margin: 0 .2em; } .round { - background-color: #444; - width: 4px; - height: 4px; + @include animation(move .75s infinite linear); + @include border-radius(10px); + background-color: #444444; display: inline-block; + height: 4px; margin: 0 2px; opacity: .1; - @include border-radius(10px); - @include animation(move .75s infinite linear); + width: 4px; } @for $i from 1 through 3 { @@ -42,6 +42,7 @@ from { opacity: 1; } + to { opacity: .1; } diff --git a/webapp/sass/routes/_settings.scss b/webapp/sass/routes/_settings.scss index 3c735be3c..1c3f2e308 100644 --- a/webapp/sass/routes/_settings.scss +++ b/webapp/sass/routes/_settings.scss @@ -2,41 +2,47 @@ .user-settings { min-height: 300px; + .table-responsive { - max-width: 560px; max-height: 300px; + max-width: 560px; } } .modal { .settings-modal { width: 800px; + .modal-back { - width: 50px; - height: 40px; - top: 12px; font-size: 27px; font-weight: normal; + height: 40px; + left: 0; line-height: 32px; position: absolute; - left: 0; text-align: center; + top: 12px; + width: 50px; + .fa { + height: 100%; + left: 0; line-height: inherit; position: absolute; width: 100%; - height: 100%; - left: 0; } } + .modal-body { - padding: 0; margin: 0 auto; min-height: calc(100% - 62px); + padding: 0; } + li { list-style: none; } + label { font-weight: 600; } @@ -44,87 +50,110 @@ .no-padding--left { padding-left: 0; } + .padding-top { padding-top: 7px; + &.x2 { padding-top: 14px; } + &.x3 { padding-top: 21px; } } + .padding-bottom { padding-bottom: 7px; + &.x2 { padding-bottom: 14px; } + &.x3 { padding-bottom: 21px; } + .control-label { font-weight: 600; + &.text-left { text-align: left; } } } + .profile-img { - width: 128px; height: 128px; + width: 128px; } + .settings-table { - max-width: 1000px; - margin: 0 auto; display: table; + margin: 0 auto; + max-width: 1000px; table-layout: fixed; width: 100%; + > div { display: table-cell; vertical-align: top; } + .nav { position: fixed; width: 179px; + &.position--top { top: 57px; } } + .security-links { margin-right: 20px; + .fa { margin-right: 6px; } } + .settings-links { width: 180px; } + .settings-content { - padding: 0px 20px 30px; + padding: 0 20px 30px; + .modal-header { display: none; } + .section-min { padding: 1em 0; margin-bottom: 0; cursor: pointer; position: relative; @include clearfix; + &:hover { background: #f9f9f9; } + &:hover .fa { display: inline-block; } + &:hover .section-edit { text-decoration: underline; } } .section-max { - background: rgba(black, .05); - padding: 1em 0 1.3em; - margin-bottom: 0; @include clearfix; + @include alpha-property(background, $black, .05); + margin-bottom: 0; + padding: 1em 0 1.3em; + .section-title { margin-bottom: 10px; } @@ -136,50 +165,54 @@ padding: 4px 5px; width: 40px; } + img { border: 1px solid rgba(black, .15); width: 29px; } } + .group--code { + select { + @include appearance(none); + appearance: none; padding-right: 25px; + + &::ms-expand { + display: none; + } } - select::-ms-expand { - display: none; - } + &:before { - pointer-events: none; - position: absolute; - top: 11px; - right: 50px; - z-index: 5; + @include font-smoothing; content: '\f0d7'; display: inline-block; font: normal normal normal 14px/1 FontAwesome; - font-size: inherit; + pointer-events: none; + position: absolute; + right: 50px; text-rendering: auto; - -webkit-font-smoothing: antialiased; - -moz-osx-font-smoothing: grayscale; - } - select { - -moz-appearance: none; - -webkit-appearance: none; - appearance: none; + top: 11px; + z-index: 5; } } + .premade-themes { margin-bottom: 10px; + .theme-label { font-weight: 400; margin-top: 5px; } + img { border: 3px solid transparent; } + .active { img { - border-color: $color--primary; + border-color: $primary-color; } } } @@ -197,12 +230,12 @@ } .theme-elements__header { - margin: 10px 20px 0px 0; border-bottom: 1px solid #ccc; - padding: 5px 0 10px; + cursor: pointer; font-size: em(13.5px); font-weight: 600; - cursor: pointer; + margin: 10px 20px 0 0; + padding: 5px 0 10px; .fa-minus { display: none; @@ -212,39 +245,41 @@ .fa-minus { display: inline-block; } + .fa-plus { display: none; } } .header__icon { - float: right; @include opacity(.5); + float: right; } } .theme-elements__body { - padding-top: 5px; - display: none; + @include border-radius(0 0 3px 3px); @include legacy-pie-clearfix; - background: rgba(255, 255, 255, .05); - padding: 20px 0 0 20px; + @include alpha-property(background-color, $white, .05); + display: none; margin: 0 20px 0 0; - @include border-radius(0 0 3px 3px); + padding: 20px 0 0 20px; } .custom-label { - white-space: nowrap; - font-weight: normal; font-size: 12px; - width: 100%; + font-weight: normal; + margin-bottom: 0; overflow: hidden; text-overflow: ellipsis; - margin-bottom: 0; + white-space: nowrap; + width: 100%; } + .input-group-addon { background: transparent; } + .radio { label { font-weight: 600; @@ -253,32 +288,33 @@ } .section-title { - margin-bottom: 5px; font-weight: 600; + margin-bottom: 5px; padding-right: 50px; } .section-edit { - text-align: right; margin-bottom: 5px; + text-align: right; + .fa { - margin-right: 5px; - font-size: 12px; @include opacity(.5); display: none; + font-size: 12px; + margin-right: 5px; &.fa-chevron-down { - top: -1px; margin-right: 0; position: relative; + top: -1px; } } } .section-describe { - @include opacity(.7); - white-space: pre; @include clearfix; + @include opacity(.7); text-overflow: ellipsis; + white-space: pre; } .divider-dark { @@ -290,8 +326,8 @@ } .setting-list { - padding: 0; list-style-type: none; + padding: 0; } .setting-list__hint { @@ -305,68 +341,77 @@ .setting-list-item { margin-top: 7px; } + .has-error { color: #a94442; } .file-status { + color: #555; font-size: 13px; margin-top: 8px; - color: #555; } .confirm-import { - padding: 4px 10px; margin: 10px 0; + padding: 4px 10px; } } } } + .nav-pills { > li { margin: 0; + a { - padding: 8px 5px 8px 15px; border-radius: 0; color: #777; + padding: 8px 5px 8px 15px; } + .glyphicon { - width: 25px; top: 2px; + width: 25px; } + &:hover { a { - background-color: rgba(black, .1); + @include alpha-property(background-color, $black, .1); } } + &.active { a { - color: #111; background-color: #e1e1e1; + color: #111; + &:before { + background: $black; content: ''; + height: 100%; + left: 0; position: absolute; top: 0; - left: 0; width: 5px; - height: 100%; - background: #000; } } + a, a:hover, a:focus { - background-color: rgba(black, .1); + @include alpha-property(background-color, $black, .1); border-radius: 0; font-weight: 400; - position: relative; - white-space: nowrap; overflow: hidden; + position: relative; text-overflow: ellipsis; + white-space: nowrap; } } } } + h3 { font-size: em(20px); } @@ -391,13 +436,15 @@ .member-div { border-bottom: 1px solid lightgrey; - position: relative; - padding: 2px; margin: 0; + padding: 2px; + position: relative; width: 100%; + &:first-child { border-top: 1px solid lightgrey; } + .post-profile-img { @include border-radius(50px); margin-right: 8px; @@ -407,14 +454,14 @@ .member-role, .member-drop { .fa { - margin-right: 5px; @include opacity(.5); font-size: 12px; + margin-right: 5px; } .member-menu { - top: -50%; right: 110%; + top: -50%; } } @@ -425,13 +472,13 @@ } .member-menu { - right: 0px; left: auto; + right: 0; } .member-list { - width: 100%; overflow-x: visible; + width: 100%; } .member-page { diff --git a/webapp/sass/routes/_signup.scss b/webapp/sass/routes/_signup.scss index 53c59c222..09f8e4185 100644 --- a/webapp/sass/routes/_signup.scss +++ b/webapp/sass/routes/_signup.scss @@ -1,19 +1,19 @@ @charset 'UTF-8'; .signup-header { - width: 100%; + background: $bg--gray; line-height: 33px; padding: 0 1em .2em; - background: $bg--gray; + width: 100%; .fa { margin-right: 5px; } } .signup-team__container { - padding: 100px 0px 50px 0px; - max-width: 380px; margin: 0 auto; + max-width: 380px; + padding: 100px 0 50px; position: relative; &.padding--less { @@ -21,7 +21,7 @@ } .form-control:focus { - @include box-shadow(inset 0 1px 1px rgba(0,0,0,.075),0 0 8px rgba(102,175,233,.6)); + @include box-shadow(inset 0 1px 1px rgba(0, 0, 0, .075), 0 0 8px rgba(102, 175, 233, .6)); } h1, @@ -39,16 +39,16 @@ } h2 { + font-size: em(30px); font-weight: 600; - margin-bottom: .8em; letter-spacing: -.5px; - font-size: em(30px); + margin-bottom: .8em; } h3 { - font-weight: 600; - margin: 0 0 1.3em 0; font-size: 1.5em; + font-weight: 600; + margin: 0 0 1.3em; } h4 { @@ -66,7 +66,7 @@ } p { - color: #555; + color: #555555; line-height: 1.5; margin-bottom: 1em; } @@ -81,32 +81,32 @@ } .form-control { - text-align: left; display: table-cell; + text-align: left; width: 100%; } .input-group-addon { - text-align: left; - width: 50%; display: table-cell; overflow: hidden; + text-align: left; text-overflow: ellipsis; + width: 50%; } } } .inner__content { - padding: 0 1rem; margin: 30px 0 20px; + padding: 0 1rem; } .block--gray { + @include border-radius(3px); background: #f2f2f2; display: inline-block; - padding: .85em 1.2em; font-weight: 600; - @include border-radius(3px); + padding: .85em 1.2em; } form { @@ -114,32 +114,32 @@ } .signup-team-confirm__container { - padding: 100px 0px 100px 0px; + padding: 100px 0; } .signup-team-logo { display: none; + margin: 0 0 2em; width: 210px; - margin: 0 0 2em 0; } .signup-team-login { - padding-bottom: 10px; font-weight: 600; + padding-bottom: 10px; } .signup-team__name { - margin: .5em 0 0; font-size: 2.2em; font-weight: 600; + margin: .5em 0 0; padding-left: 1rem; } .signup-team__subdomain { - margin: .2em 0 1.2em; font-size: 1.5em; - padding-left: 1rem; font-weight: 300; + margin: .2em 0 1.2em; + padding-left: 1rem; text-transform: uppercase; } @@ -148,21 +148,21 @@ } .or__container { + background: #dddddd; height: 1px; - background: #ddd; - text-align: left; margin: 2em 0; + text-align: left; span { - width: 40px; - top: -10px; - position: relative; + background: #ffffff; + display: inline-block; font-size: 1.14286em; - line-height: 20px; font-weight: 600; - background: #fff; - display: inline-block; + line-height: 20px; + position: relative; text-align: center; + top: -10px; + width: 40px; } } @@ -177,9 +177,9 @@ .btn { font-size: 1em; - padding: em(7px) em(15px); font-weight: 600; margin-right: 5px; + padding: em(7px) em(15px); .fa { font-size: 17px; @@ -187,29 +187,29 @@ } .icon { - width: 18px; - height: 18px; - margin-right: 8px; @include background-size(100% 100%); display: inline-block; + height: 18px; + margin-right: 8px; + width: 18px; } &.btn-custom-login { + @include border-radius(2px); + color: $white; display: block; - min-width: 200px; - width: 200px; - padding: 0 1em; - margin: 1em 1rem; height: 40px; line-height: 34px; - color: #fff; - @include border-radius(2px); + margin: 1em 1rem; + min-width: 200px; + padding: 0 1em; + width: 200px; &.gitlab { - background: #548; + background: #554488; &:hover { - background: darken(#548, 10%); + background: darken(#554488, 10%); } span { @@ -250,10 +250,10 @@ } &.email { - background: #2389d7; + background: $primary-color; &:hover { - background: darken(#2389d7, 10%); + background: $primary-color--hover; } span { @@ -269,15 +269,15 @@ } &.btn-default { - color: #444; + color: #444444; } .glyphicon { &.glyphicon-ok, &.glyphicon-refresh { - margin-right: .5em; - left: -2px; font-size: .9em; + left: -2px; + margin-right: .5em; } &.glyphicon-chevron-right { @@ -296,28 +296,29 @@ .has-error { .control-label { - background: #f2f2f2; - padding: .7em 1em; @include border-radius(3px); - margin: 1em 0 0; + background: #f2f2f2; + color: #999999; font-size: 14px; font-weight: normal; - color: #999; + margin: 1em 0 0; + padding: .7em 1em; width: 100%; &:before { - @extend .fa; + @extend %font-awesome; + color: #aaaaaa; content: '\f071'; margin-right: 4px; - color: #aaa; } } } .reset-form { @include border-radius(3px); - position: relative; font-size: .95em; + position: relative; + p { color: inherit; } @@ -363,12 +364,12 @@ .black, &.black { - color: #000; + color: #000000; } } .color--light { - color: #777; + color: #777777; } .margin--extra { @@ -381,9 +382,10 @@ } .signup-team-all { - margin: 0 0 20px; - border: 1px solid #ddd; @include border-radius(2px); + border: 1px solid #dddddd; + margin: 0 0 20px; + .signup-team-dir { background: #fafafa; border-top: 1px solid #d5d5d5; @@ -395,25 +397,25 @@ a { color: inherit; display: block; - padding: 0 15px; - line-height: 3.5em; - height: 3.5em; font-size: 1.1em; + height: 3.5em; + line-height: 3.5em; + padding: 0 15px; } } .signup-team-dir__name { - white-space: nowrap; float: left; overflow: hidden; text-overflow: ellipsis; + white-space: nowrap; width: 90%; } .signup-team-dir__arrow { + color: #999999; float: right; font-size: .9em; - color: #999; line-height: 3.5em; } } diff --git a/webapp/sass/routes/_statistics.scss b/webapp/sass/routes/_statistics.scss index b48c137c3..797bc480b 100644 --- a/webapp/sass/routes/_statistics.scss +++ b/webapp/sass/routes/_statistics.scss @@ -2,45 +2,45 @@ .team_statistics { .total-count { + @include border-radius(3px); + background: $white; + border: 1px solid $light-gray; margin: 1em 0; text-align: center; - background: #fff; - border: 1px solid #ddd; width: 100%; - @include border-radius(3px); .title { + border-bottom: 1px solid $light-gray; + font-size: 13px; font-weight: 400; padding: 7px 10px; - border-bottom: 1px solid #ddd; text-align: left; - font-size: 13px; .fa { + color: #555555; float: right; - margin: 0px 0 0; - color: #555; font-size: 16px; + margin: 0; } } .content { + color: #555555; font-size: 30px; font-weight: 600; - color: #555; - padding: .3em 0 .35em; overflow: auto; + padding: .3em 0 .35em; } } .total-count--day { - width: 760px; - height: 275px; - border: 1px solid #ddd; - padding: 5px 10px 10px 10px; - margin: 10px 10px 10px 10px; - background: #fff; + background: $white; + border: 1px solid $light-gray; clear: both; + height: 275px; + margin: 10px; + padding: 5px 10px 10px; + width: 760px; > div { font-size: 18px; @@ -50,8 +50,8 @@ .recent-active-users { table { - width: 100%; table-layout: fixed; + width: 100%; } .content { @@ -68,14 +68,15 @@ } td { - font-weight: 400; - white-space: nowrap; - text-overflow: ellipsis; + @include clearfix; + border-left: 1px solid $light-gray; + border-top: 1px solid $light-gray; font-size: 13px; - border-left: 1px solid #ddd; - border-top: 1px solid #ddd; + font-weight: 400; padding: 5px 5px 6px; - @include clearfix; + text-overflow: ellipsis; + white-space: nowrap; + &:first-child { border-left: none; } |