diff options
Diffstat (limited to 'web/sass-files')
-rw-r--r-- | web/sass-files/sass/partials/_admin-console.scss | 185 | ||||
-rw-r--r-- | web/sass-files/sass/partials/_base.scss | 8 | ||||
-rw-r--r-- | web/sass-files/sass/partials/_command-box.scss | 16 | ||||
-rw-r--r-- | web/sass-files/sass/partials/_forms.scss | 33 | ||||
-rw-r--r-- | web/sass-files/sass/partials/_headers.scss | 10 | ||||
-rw-r--r-- | web/sass-files/sass/partials/_responsive.scss | 7 | ||||
-rw-r--r-- | web/sass-files/sass/partials/_sidebar--left.scss | 17 | ||||
-rw-r--r-- | web/sass-files/sass/partials/_signup.scss | 15 | ||||
-rw-r--r-- | web/sass-files/sass/styles.scss | 2 |
9 files changed, 274 insertions, 19 deletions
diff --git a/web/sass-files/sass/partials/_admin-console.scss b/web/sass-files/sass/partials/_admin-console.scss new file mode 100644 index 000000000..9823d2611 --- /dev/null +++ b/web/sass-files/sass/partials/_admin-console.scss @@ -0,0 +1,185 @@ +.sidebar--left { + &.sidebar--collapsable { + background: #333; + .team__header { + background: transparent; + margin-bottom: 5px; + } + .nav { + li { + padding: 0; + .icon { + width: 15px; + } + > a { + color: #fff; + padding: 9px 15px; + display: block; + &:hover, &.active, &:focus { + background-color: $primary-color; + } + } + } + .menu-icon--right { + vertical-align: top; + padding: 5px 10px; + margin: -5px; + float: right; + .fa { + font-size: 13px; + right: -2px; + position: relative; + } + } + &.nav__sub-menu { + padding: 5px 0; + background: #111; + -webkit-font-smoothing: auto; + li { + > a { + font-size: 13px; + padding: 5px 15px; + background: transparent; + color: #bbb; + &:hover { + color: lighten($primary-color, 10); + } + &.active { + color: #fff; + font-weight: 600; + } + } + .nav-more { + font-size: 13px; + padding: 5px 15px; + background: transparent; + color: #bbb; + display: block; + cursor: pointer; + &:hover { + color: lighten($primary-color, 10); + } + } + } + } + &.nav__inner-menu { + li { + > a { + padding-left: 20px; + } + } + } + } + } +} + +.log__panel { + overflow: scroll; + width: 100%; + height: 800px; + border: 1px solid #ddd; + margin-top: 10px; + padding: 5px; + background-color: white; +} + +.app__content { + &.admin { + overflow: auto; + background-color: #f1f1f1; + padding: 0 20px 20px; + } + .wrapper--fixed { + max-width: 800px; + } + .form-horizontal { + margin-top: 40px; + .control-label { + text-align: left; + padding-right: 0; + font-weight: 600; + } + .form-group { + margin-bottom: 25px; + } + .help-text { + margin: 10px 0 0 15px; + color: #777; + .help-link { + margin-right: 5px; + } + .btn { + font-size: 13px; + } + } + .alert { + display: inline-block; + padding: 5px 7px; + margin: 0; + top: 1px; + position: relative; + } + } + .banner { + background: #fff; + border: 1px solid #ddd; + padding: 0.7em 1.5em; + font-size: 0.95em; + margin: 2em 0; + .banner__heading { + font-size: 1.5em; + } + .banner__content { + width: 80%; + } + } + .popover { + border-radius: 3px; + border: 1px solid #ccc; + width: 100%; + font-size: 0.95em; + } + .panel { + border: none; + background-color: transparent; + } + .panel-default { + > .panel-heading { + padding: 10px 0; + background-color: transparent; + } + .panel-body { + padding: 30px 0 10px; + } + } + .panel-group { + margin-bottom: 50px; + } + .panel-title { + font-size: 24px; + line-height: 1.5; + a { + text-decoration: none; + display: block; + @include clearfix; + &.collapsed { + .fa-minus { + display: none; + } + .fa-plus { + display: inline-block; + } + } + .fa { + font-size: 18px; + float: right; + margin-top: 8px; + color: #aaa; + } + .fa-plus { + display: none; + } + } + } + +}
\ No newline at end of file diff --git a/web/sass-files/sass/partials/_base.scss b/web/sass-files/sass/partials/_base.scss index e817761ee..cdc2152e9 100644 --- a/web/sass-files/sass/partials/_base.scss +++ b/web/sass-files/sass/partials/_base.scss @@ -128,3 +128,11 @@ div.theme { .white-bg { background-color: white !important; } + +.emoji { + width: 1.5em; + height: 1.5em; + display: inline-block; + margin-bottom: 0.25em; + background-size: contain; +} diff --git a/web/sass-files/sass/partials/_command-box.scss b/web/sass-files/sass/partials/_command-box.scss index 565296fae..44eb9b8df 100644 --- a/web/sass-files/sass/partials/_command-box.scss +++ b/web/sass-files/sass/partials/_command-box.scss @@ -4,30 +4,20 @@ width: 100%; border: $border-gray; bottom: 38px; - overflow: auto; @extend %popover-box-shadow; - .sidebar--right & { - bottom: 100px; - } } .command-name { position: relative; width: 100%; background-color: #fff; - line-height: 24px; - padding: 5px 10px 8px; + height: 37px; + line-height: 37px; + padding: 2px 10px 2px 5px; z-index: 101; - font-size: 0.95em; - border-bottom: 1px solid #ddd; &:hover { background-color: #e8eaed; } - .command__desc { - margin-left: 5px; - color: #999; - line-height: normal; - } } .command-desc { diff --git a/web/sass-files/sass/partials/_forms.scss b/web/sass-files/sass/partials/_forms.scss new file mode 100644 index 000000000..268576a98 --- /dev/null +++ b/web/sass-files/sass/partials/_forms.scss @@ -0,0 +1,33 @@ +.form-horizontal { + .modal-intro { + margin: -10px 0 30px; + } + .form__label { + text-align: left; + padding-right: 3px; + font-weight: bold; + font-size: 1.1em; + &.light { + color: #999; + font-size: 1.05em; + font-style: italic; + padding-top: 2px; + } + } + .input__help { + color: #777; + margin: 10px 0 0 10px; + &.error { + color: #a94442; + } + } + .form-control { + font-weight: normal; + } + .form-group { + margin-bottom: 25px; + &.less { + margin-bottom: 10px; + } + } +} diff --git a/web/sass-files/sass/partials/_headers.scss b/web/sass-files/sass/partials/_headers.scss index c311941b6..702f0fd60 100644 --- a/web/sass-files/sass/partials/_headers.scss +++ b/web/sass-files/sass/partials/_headers.scss @@ -133,7 +133,7 @@ .navbar-right { font-size: 0.85em; position: absolute; - top: 10px; + top: 11px; right: 22px; z-index: 5; .dropdown-toggle { @@ -145,6 +145,8 @@ li a { padding: 3px 20px; color: #555; + text-overflow: ellipsis; + overflow: hidden; } } .dropdown__icon { @@ -169,7 +171,6 @@ } .team__name, .user__name { display: block; - line-height: 18px; font-weight: 600; font-size: 16px; max-width: 80%; @@ -178,9 +179,14 @@ text-overflow: ellipsis; text-decoration: none; } + .team__name { + line-height: 22px; + margin-top: -2px; + } .user__name { @include single-transition(all, 0.1s, linear); font-size: 14px; + line-height: 18px; font-weight: 400; color: #eee; color: rgba(#fff, 0.8); diff --git a/web/sass-files/sass/partials/_responsive.scss b/web/sass-files/sass/partials/_responsive.scss index 32d65b86b..d29c653ff 100644 --- a/web/sass-files/sass/partials/_responsive.scss +++ b/web/sass-files/sass/partials/_responsive.scss @@ -584,6 +584,9 @@ &.move--right { @include translate3d(0, 0, 0); } + .badge { + top: 13px; + } > div { padding-bottom: 105px; } @@ -687,10 +690,10 @@ } } .app__content { - padding-top: 50px; + padding-top: 45px; margin: 0; .channel__wrap & { - padding-top: 50px; + padding-top: 45px; } .channel-header { display: none; diff --git a/web/sass-files/sass/partials/_sidebar--left.scss b/web/sass-files/sass/partials/_sidebar--left.scss index 63426dae9..f714a23f8 100644 --- a/web/sass-files/sass/partials/_sidebar--left.scss +++ b/web/sass-files/sass/partials/_sidebar--left.scss @@ -12,7 +12,10 @@ } .dropdown-menu { max-height: 300px; - overflow: auto; + overflow-x: hidden; + overflow-y: auto; + max-width: 200px; + width: 200px; } .search__form { margin: 0; @@ -27,6 +30,9 @@ } .badge { background-color: $primary-color; + position: absolute; + right: 10px; + top: 5px; } .status { position:relative; @@ -63,7 +69,7 @@ top: 66px; } .nav-pills__unread-indicator-bottom { - bottom: 10px; + bottom: 0px; } .nav { @@ -87,6 +93,12 @@ line-height: 1.5; border-radius: 0; color: #999; + white-space: nowrap; + overflow: hidden; + text-overflow: ellipsis; + &.has-badge { + padding-right: 30px; + } &.nav-more { text-decoration: underline; } @@ -101,6 +113,7 @@ &.active { a, a:hover, a:focus { color: #111; + padding-right: 10px; background-color: #e1e1e1; border-radius: 0; font-weight: 400; diff --git a/web/sass-files/sass/partials/_signup.scss b/web/sass-files/sass/partials/_signup.scss index 2fb56e537..924f0718a 100644 --- a/web/sass-files/sass/partials/_signup.scss +++ b/web/sass-files/sass/partials/_signup.scss @@ -315,3 +315,18 @@ } } + +.authorize-box { + margin: 100px auto; + width:500px; + height:280px; + border: 1px solid black; +} + +.authorize-inner { + padding: 20px; +} + +.authorize-btn { + margin-right: 6px; +} diff --git a/web/sass-files/sass/styles.scss b/web/sass-files/sass/styles.scss index eb5152a2c..de1db57e8 100644 --- a/web/sass-files/sass/styles.scss +++ b/web/sass-files/sass/styles.scss @@ -23,11 +23,13 @@ @import "partials/sidebar--left"; @import "partials/sidebar--right"; @import "partials/sidebar--menu"; +@import "partials/admin-console"; @import "partials/signup"; @import "partials/files"; @import "partials/videos"; @import "partials/settings"; @import "partials/modal"; +@import "partials/forms"; @import "partials/mentions"; @import "partials/command-box"; @import "partials/error"; |