summaryrefslogtreecommitdiffstats
path: root/web/sass-files
diff options
context:
space:
mode:
Diffstat (limited to 'web/sass-files')
-rw-r--r--web/sass-files/sass/partials/_access-history.scss4
-rw-r--r--web/sass-files/sass/partials/_base.scss54
-rw-r--r--web/sass-files/sass/partials/_command-box.scss25
-rw-r--r--web/sass-files/sass/partials/_error-bar.scss25
-rw-r--r--web/sass-files/sass/partials/_headers.scss5
-rw-r--r--web/sass-files/sass/partials/_mentions.scss1
-rw-r--r--web/sass-files/sass/partials/_responsive.scss26
-rw-r--r--web/sass-files/sass/partials/_settings.scss8
-rw-r--r--web/sass-files/sass/partials/_signup.scss2
-rw-r--r--web/sass-files/sass/partials/_variables.scss6
-rw-r--r--web/sass-files/sass/styles.scss2
11 files changed, 79 insertions, 79 deletions
diff --git a/web/sass-files/sass/partials/_access-history.scss b/web/sass-files/sass/partials/_access-history.scss
index f54c9a122..412a2a1d0 100644
--- a/web/sass-files/sass/partials/_access-history.scss
+++ b/web/sass-files/sass/partials/_access-history.scss
@@ -12,7 +12,7 @@
}
.access__date {
font-weight: 600;
- font-size: 16px;
+ font-size: 15px;
width: 190px;
}
.access__report {
@@ -21,7 +21,7 @@
}
.report__time {
font-weight: 600;
- font-size: 16px;
+ font-size: 15px;
}
.report__info {
color: #999;
diff --git a/web/sass-files/sass/partials/_base.scss b/web/sass-files/sass/partials/_base.scss
index 1fb970075..52659521d 100644
--- a/web/sass-files/sass/partials/_base.scss
+++ b/web/sass-files/sass/partials/_base.scss
@@ -5,7 +5,7 @@ html, body {
body {
font-family: 'Open Sans', sans-serif;
-webkit-font-smoothing: antialiased;
- background: #e9e9e9;
+ background: $body-bg;
position: relative;
height: 100%;
&.white {
@@ -96,32 +96,6 @@ div.theme {
position:relative;
}
-.command-box {
- position:absolute;
- background-color:#fff;
- width:100%;
- border:1px solid #ddd;
- bottom: 38;
-}
-
-.command-name {
- position: relative;
- width: 100%;
- background-color: #fff;
- height: 37px;
- line-height: 37px;
- padding: 2px 10px 2px 5px;
- z-index: 101;
-}
-
-.command-name:hover {
- background-color:#e8eaed;
-}
-
-.command-desc {
- color: #a7a8ab;
-}
-
@-webkit-keyframes spin2 {
from { -webkit-transform: rotate(0deg);}
to { -webkit-transform: rotate(360deg);}
@@ -139,29 +113,3 @@ div.theme {
.black-bg {
background-color: black !important;
}
-
-#error_bar {
- background-color: #0099FF;
- text-align:center;
- position: relative;
- color: #fff;
- position: fixed;
- top: 0;
- width: 100%;
- z-index: 9999;
-
- .error-bar {
- padding: 5px 30px;
- }
-
- .error-close {
- position: absolute;
- right: 0;
- top: 0;
- color: #FFF;
- font-size: 20px;
- font-weight: 600;
- text-decoration: none;
- padding: 0 10px;
- }
-} \ No newline at end of file
diff --git a/web/sass-files/sass/partials/_command-box.scss b/web/sass-files/sass/partials/_command-box.scss
new file mode 100644
index 000000000..44eb9b8df
--- /dev/null
+++ b/web/sass-files/sass/partials/_command-box.scss
@@ -0,0 +1,25 @@
+.command-box {
+ position: absolute;
+ background-color: #fff;
+ width: 100%;
+ border: $border-gray;
+ bottom: 38px;
+ @extend %popover-box-shadow;
+}
+
+.command-name {
+ position: relative;
+ width: 100%;
+ background-color: #fff;
+ height: 37px;
+ line-height: 37px;
+ padding: 2px 10px 2px 5px;
+ z-index: 101;
+ &:hover {
+ background-color: #e8eaed;
+ }
+}
+
+.command-desc {
+ color: #a7a8ab;
+} \ No newline at end of file
diff --git a/web/sass-files/sass/partials/_error-bar.scss b/web/sass-files/sass/partials/_error-bar.scss
new file mode 100644
index 000000000..2e3d3c87e
--- /dev/null
+++ b/web/sass-files/sass/partials/_error-bar.scss
@@ -0,0 +1,25 @@
+.error-bar {
+ background-color: #0099FF;
+ text-align:center;
+ position: relative;
+ color: #fff;
+ position: fixed;
+ top: 0;
+ width: 100%;
+ z-index: 9999;
+ padding: 5px 30px;
+ &__close {
+ position: absolute;
+ right: 0;
+ top: 0;
+ color: #FFF;
+ font-size: 20px;
+ font-weight: 600;
+ text-decoration: none;
+ padding: 0 10px;
+ &:hover {
+ color: #FFF;
+ text-decoration: none;
+ }
+ }
+}
diff --git a/web/sass-files/sass/partials/_headers.scss b/web/sass-files/sass/partials/_headers.scss
index eab4becac..4351e167b 100644
--- a/web/sass-files/sass/partials/_headers.scss
+++ b/web/sass-files/sass/partials/_headers.scss
@@ -92,10 +92,10 @@
.navbar-right {
font-size: 0.85em;
position: absolute;
- top: 20px;
+ top: 10px;
right: 22px;
.dropdown-toggle {
- padding: 0 10px;
+ padding: 10px;
}
.dropdown-menu {
li a {
@@ -119,6 +119,7 @@
}
.header__info {
color: #fff;
+ padding-left: 3px
}
.team__name, .user__name {
display: block;
diff --git a/web/sass-files/sass/partials/_mentions.scss b/web/sass-files/sass/partials/_mentions.scss
index 1396f21a1..a8c4dec26 100644
--- a/web/sass-files/sass/partials/_mentions.scss
+++ b/web/sass-files/sass/partials/_mentions.scss
@@ -10,6 +10,7 @@
.mentions--top {
position: absolute;
z-index: 1060;
+ @extend %popover-box-shadow;
.mentions-box {
width: 100%;
height: 100%;
diff --git a/web/sass-files/sass/partials/_responsive.scss b/web/sass-files/sass/partials/_responsive.scss
index d8a8fd982..3a2768a47 100644
--- a/web/sass-files/sass/partials/_responsive.scss
+++ b/web/sass-files/sass/partials/_responsive.scss
@@ -451,31 +451,23 @@
color: #fff;
.search__form {
border: none;
- padding: 0 60px 0 25px;
+ padding: 0 60px 0 35px;
.form-control {
- line-height: 31px;
+ line-height: normal;
background: none;
color: #fff;
border-radius: 0;
- padding: 0 10px 0;
+ padding: 0;
+ border-bottom: 1px solid #FFF;
+ border-bottom: 1px solid rgba(#fff, 0.6);
@include input-placeholder {
color: rgba(#fff, 0.6);
}
}
- ::-webkit-input-placeholder {
- color: #fff;
- }
-
- :-moz-placeholder { /* Firefox 18- */
- color: #fff;
- }
-
- ::-moz-placeholder { /* Firefox 19+ */
- color: #fff;
- }
-
- :-ms-input-placeholder {
- color: #fff;
+ input[type=text] {
+ @include input-placeholder {
+ color: #fff;
+ }
}
}
}
diff --git a/web/sass-files/sass/partials/_settings.scss b/web/sass-files/sass/partials/_settings.scss
index b8dc9e997..1fb078bb9 100644
--- a/web/sass-files/sass/partials/_settings.scss
+++ b/web/sass-files/sass/partials/_settings.scss
@@ -163,8 +163,10 @@
}
.profile-img {
- width:158px;
- max-height:128px;
+ width:128px;
+ height:128px;
+ margin-bottom: 10px;
+ @include border-radius(128px);
}
.sel-btn {
@@ -232,4 +234,4 @@
.color-btn {
margin:4px;
-} \ No newline at end of file
+}
diff --git a/web/sass-files/sass/partials/_signup.scss b/web/sass-files/sass/partials/_signup.scss
index 98931279b..db22718d2 100644
--- a/web/sass-files/sass/partials/_signup.scss
+++ b/web/sass-files/sass/partials/_signup.scss
@@ -6,7 +6,7 @@
}
.signup-team__container {
padding: 100px 0px 50px 0px;
- max-width: 600px;
+ max-width: 380px;
margin: 0 auto;
font-size: 1.1em;
position: relative;
diff --git a/web/sass-files/sass/partials/_variables.scss b/web/sass-files/sass/partials/_variables.scss
index 5d883ab44..78952abb5 100644
--- a/web/sass-files/sass/partials/_variables.scss
+++ b/web/sass-files/sass/partials/_variables.scss
@@ -7,4 +7,8 @@ $primary-color: #2389D7;
$primary-color--hover: darken(#2389D7, 5%);
$body-bg: #e9e9e9;
$header-bg: #f9f9f9;
-$border-gray: 1px solid #ddd; \ No newline at end of file
+$border-gray: 1px solid #ddd;
+
+%popover-box-shadow {
+ @include box-shadow(rgba(black, 0.175) 1px -3px 12px);
+}
diff --git a/web/sass-files/sass/styles.scss b/web/sass-files/sass/styles.scss
index 294f6122a..ffd1f42b8 100644
--- a/web/sass-files/sass/styles.scss
+++ b/web/sass-files/sass/styles.scss
@@ -29,7 +29,9 @@
@import "partials/settings";
@import "partials/modal";
@import "partials/mentions";
+@import "partials/command-box";
@import "partials/error";
+@import "partials/error-bar";
@import "partials/loading";
// Responsive Css