summaryrefslogtreecommitdiff
path: root/app/assets/stylesheets/framework
diff options
context:
space:
mode:
authorRoman Rott <roman.rott@gmail.com>2016-02-03 19:18:55 +0200
committerRobert Speicher <rspeicher@gmail.com>2016-02-05 15:11:46 -0500
commit9cc321ca17d775c417c7bbeb1fb9b0636dd338b4 (patch)
tree2df25b5c50f4675f9dcb9463e2e0ecd8d82adc4a /app/assets/stylesheets/framework
parent42e0e35784de81d2a0f7bff05870ddc5c531d0bb (diff)
downloadgitlab-ce-9cc321ca17d775c417c7bbeb1fb9b0636dd338b4.tar.gz
fixed issue with poor logo transition animation on safari
updates after code review: moved coffee code to appropriate file, updated css to not use js-prefixed selectors Updated comments and Changelog Removed duplicate line in changelog
Diffstat (limited to 'app/assets/stylesheets/framework')
-rw-r--r--app/assets/stylesheets/framework/sidebar.scss15
1 files changed, 14 insertions, 1 deletions
diff --git a/app/assets/stylesheets/framework/sidebar.scss b/app/assets/stylesheets/framework/sidebar.scss
index b7f532c0771..b141928f706 100644
--- a/app/assets/stylesheets/framework/sidebar.scss
+++ b/app/assets/stylesheets/framework/sidebar.scss
@@ -45,6 +45,19 @@
overflow: hidden;
transition-duration: .3s;
+ .home {
+ z-index: 1;
+ position: absolute;
+ left: 0px;
+ }
+
+ #logo {
+ z-index: 2;
+ position: absolute;
+ width: 58px;
+ cursor: pointer;
+ }
+
a {
float: left;
height: $header-height;
@@ -70,7 +83,7 @@
width: 158px;
float: left;
margin: 0;
- margin-left: 14px;
+ margin-left: 50px;
font-size: 19px;
line-height: 41px;
font-weight: normal;