Download as
Browse Code »

Commit 3f9749dd86874c4b6dcbdad7d3cd0dc7406a20b8

Authored by randx
1 parent 93401ef9
Exists in master and in 4 other branches 6-8-stable, 7-0-stable, 7-0-stable-spb, spb-stable

Fix branch selector. Few css fixed also

Showing 6 changed files with 9 additions and 7 deletions   Show diff stats
app/assets/stylesheets/sections/login.scss
  Diff comments   View file @3f9749d
... ... @@ -27,6 +27,7 @@ body.login-page{
27 27 -moz-border-radius-topright: 5px;
28 28 border-top-left-radius: 5px;
29 29 border-top-right-radius: 5px;
  30 + margin-bottom:0px;
30 31 }
31 32  
32 33 .login-box input.text.bottom{
... ...
app/assets/stylesheets/sections/notes.scss
  Diff comments   View file @3f9749d
... ... @@ -48,7 +48,7 @@
48 48 p { color:$style_color; }
49 49 .note-author { color: $style_color;}
50 50  
51   - .note-title { margin-left:50px; padding-top: 5px;}
  51 + .note-title { padding-top: 5px;}
52 52 .avatar {
53 53 margin-top:3px;
54 54 }
... ...
app/assets/stylesheets/themes/ui_modern.scss
  Diff comments   View file @3f9749d
... ... @@ -37,6 +37,7 @@
37 37 *
38 38 */
39 39 .app_logo {
  40 + width:160px;
40 41 a {
41 42 h1 {
42 43 opacity: 0.7;
... ... @@ -56,7 +57,7 @@
56 57 .separator {
57 58 width: 1px;
58 59 height: 40px;
59   - margin: 0 9px;
  60 + margin: 0 10px;
60 61 overflow: hidden;
61 62 background: #222;
62 63 border-left: 1px solid #333;
... ... @@ -73,6 +74,7 @@
73 74 background:none;
74 75 margin-left:8px;
75 76 font-size: 13px;
  77 + font-weight:bold;
76 78 line-height: 19px;
77 79 color:#ccc;
78 80 &:hover {
... ... @@ -81,6 +83,7 @@
81 83 border: none;
82 84 box-shadow:none;
83 85 text-shadow: 0 -1px 0 #000000;
  86 + border-left: 1px solid #333;
84 87 }
85 88 }
86 89  
... ... @@ -115,7 +118,7 @@
115 118 .project_name {
116 119 line-height:34px;
117 120 font-size:22px;
118   - color:#fff;
  121 + color:#ccc;
119 122 text-shadow: 0 1px 1px #111;
120 123 }
121 124  
... ...
app/views/notes/_show.html.haml
  Diff comments   View file @3f9749d
1 1 %li{id: dom_id(note), class: "note"}
2   - = image_tag gravatar_icon(note.author.email), class: "avatar"
  2 + = image_tag gravatar_icon(note.author.email), class: "avatar s32"
3 3 %div.note-author
4 4 %strong= note.author_name
5 5 = link_to "##{dom_id(note)}", name: dom_id(note) do
... ...
app/views/refs/_tree.html.haml
  Diff comments   View file @3f9749d
... ... @@ -51,8 +51,6 @@
51 51  
52 52 :javascript
53 53 $(function(){
54   - $('select#branch').selectmenu({style:'popup', width:200});
55   - $('select#tag').selectmenu({style:'popup', width:200});
56 54 $('.project-refs-select').chosen();
57 55  
58 56 history.pushState({ path: this.path }, '', "#{@history_path}");
... ...
app/views/refs/_tree_commit.html.haml
  Diff comments   View file @3f9749d
1 1 - if tm
2   - %strong= link_to "[#{tm.user_name}]", project_team_member_path(@project, tm)
  2 + = link_to "[#{tm.user_name}]", project_team_member_path(@project, tm)
3 3 = link_to_gfm truncate(content_commit.title, length: tm ? 30 : 50), project_commit_path(@project, content_commit.id), class: "tree-commit-link"
... ...