diff --git a/app/assets/stylesheets/sections/login.scss b/app/assets/stylesheets/sections/login.scss index 3726d9f02a413e77553a158c546dcccb026a9b21..5b8763cfec08ab7775d1b02cca78a8feb63cf6cb 100644 --- a/app/assets/stylesheets/sections/login.scss +++ b/app/assets/stylesheets/sections/login.scss @@ -27,6 +27,7 @@ body.login-page{ -moz-border-radius-topright: 5px; border-top-left-radius: 5px; border-top-right-radius: 5px; + margin-bottom:0px; } .login-box input.text.bottom{ diff --git a/app/assets/stylesheets/sections/notes.scss b/app/assets/stylesheets/sections/notes.scss index b498277d4f851e41a4c22a6c90e71b63454e71ee..c846e6a7f0a4dcf925cec3b23e02364738acff21 100644 --- a/app/assets/stylesheets/sections/notes.scss +++ b/app/assets/stylesheets/sections/notes.scss @@ -48,7 +48,7 @@ p { color:$style_color; } .note-author { color: $style_color;} - .note-title { margin-left:50px; padding-top: 5px;} + .note-title { padding-top: 5px;} .avatar { margin-top:3px; } diff --git a/app/assets/stylesheets/themes/ui_modern.scss b/app/assets/stylesheets/themes/ui_modern.scss index 29c857e54623270df0178c0c2a87bf7308897850..3fd9bb5efafcb7205dbf4f513b298b77ed0934c3 100644 --- a/app/assets/stylesheets/themes/ui_modern.scss +++ b/app/assets/stylesheets/themes/ui_modern.scss @@ -37,6 +37,7 @@ * */ .app_logo { + width:160px; a { h1 { opacity: 0.7; @@ -56,7 +57,7 @@ .separator { width: 1px; height: 40px; - margin: 0 9px; + margin: 0 10px; overflow: hidden; background: #222; border-left: 1px solid #333; @@ -73,6 +74,7 @@ background:none; margin-left:8px; font-size: 13px; + font-weight:bold; line-height: 19px; color:#ccc; &:hover { @@ -81,6 +83,7 @@ border: none; box-shadow:none; text-shadow: 0 -1px 0 #000000; + border-left: 1px solid #333; } } @@ -115,7 +118,7 @@ .project_name { line-height:34px; font-size:22px; - color:#fff; + color:#ccc; text-shadow: 0 1px 1px #111; } diff --git a/app/views/notes/_show.html.haml b/app/views/notes/_show.html.haml index bdb00546114eda028fdff949b33dc95dff636b16..3412e4ebae5baa18c4388c4f8f09c4152582c95b 100644 --- a/app/views/notes/_show.html.haml +++ b/app/views/notes/_show.html.haml @@ -1,5 +1,5 @@ %li{id: dom_id(note), class: "note"} - = image_tag gravatar_icon(note.author.email), class: "avatar" + = image_tag gravatar_icon(note.author.email), class: "avatar s32" %div.note-author %strong= note.author_name = link_to "##{dom_id(note)}", name: dom_id(note) do diff --git a/app/views/refs/_tree.html.haml b/app/views/refs/_tree.html.haml index 6f8175da7a033df2b21b8e882b98a7951f9a36e2..c231c40735c3bd73a2cf0940bd4e1b941ef40419 100644 --- a/app/views/refs/_tree.html.haml +++ b/app/views/refs/_tree.html.haml @@ -51,8 +51,6 @@ :javascript $(function(){ - $('select#branch').selectmenu({style:'popup', width:200}); - $('select#tag').selectmenu({style:'popup', width:200}); $('.project-refs-select').chosen(); history.pushState({ path: this.path }, '', "#{@history_path}"); diff --git a/app/views/refs/_tree_commit.html.haml b/app/views/refs/_tree_commit.html.haml index a5681aa2f6199bc929f8f0cbfc413448917cb632..1bcf1a7ea1d430e3ae3ab4db3b186fde9c53c1d0 100644 --- a/app/views/refs/_tree_commit.html.haml +++ b/app/views/refs/_tree_commit.html.haml @@ -1,3 +1,3 @@ - if tm - %strong= link_to "[#{tm.user_name}]", project_team_member_path(@project, tm) + = link_to "[#{tm.user_name}]", project_team_member_path(@project, tm) = link_to_gfm truncate(content_commit.title, length: tm ? 30 : 50), project_commit_path(@project, content_commit.id), class: "tree-commit-link"