Respect default theme settings. Fixed sign-in button on publica page

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

Respect default theme settings. Fixed sign-in button on publica page
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Dmitriy Zaporozhets
1 parent a67f3c39
Showing 3 changed files with 11 additions and 10 deletions Show diff stats
app/assets/stylesheets/common.scss
app/views/layouts/_public_head_panel.html.haml
lib/gitlab/theme.rb
@@ -333,12 +333,6 @@ table {
   min-height: 100px;
 }
  
-.navbar-gitlab .navbar-inner .nav > li .btn-sign-in {
-  @extend .btn-new;
-  padding: 5px 15px;
-  text-shadow: none;
-}
-
 .broadcast-message {
   padding: 10px;
   text-align: center;
@@ -390,3 +384,9 @@ table {
     margin-bottom: 15px;
   }
 }
+
+.btn-sign-in {
+  margin-top: 7px;
+  text-shadow: none;
+}
+
@@ -12,11 +12,12 @@
         - else
           Public Projects
  
-      %ul.nav
+      .pull-right
+        = link_to "Sign in", new_session_path(:user), class: 'btn btn-sign-in btn-new'
+
+      %ul.nav.navbar-nav
         %li
           %a
             %div.hide.turbolink-spinner
               %i.icon-refresh.icon-spin
               Loading...
-        %li
-          = link_to "Sign in", new_session_path(:user), class: 'btn btn-sign-in'
@@ -15,7 +15,7 @@ module Gitlab
         COLOR  => "ui_color"
       }
  
-      id ||= 1
+      id ||= Gitlab.config.gitlab.default_theme
  
       return themes[id]
     end
...	...	@@ -333,12 +333,6 @@ table {
333	333	min-height: 100px;
334	334	}
335	335
336		-.navbar-gitlab .navbar-inner .nav > li .btn-sign-in {
337		- @extend .btn-new;
338		- padding: 5px 15px;
339		- text-shadow: none;
340		-}
341		-
342	336	.broadcast-message {
343	337	padding: 10px;
344	338	text-align: center;
...	...	@@ -390,3 +384,9 @@ table {
390	384	margin-bottom: 15px;
391	385	}
392	386	}
	387	+
	388	+.btn-sign-in {
	389	+ margin-top: 7px;
	390	+ text-shadow: none;
	391	+}
	392	+
...	...
...	...	@@ -12,11 +12,12 @@
12	12	- else
13	13	Public Projects
14	14
15		- %ul.nav
	15	+ .pull-right
	16	+ = link_to "Sign in", new_session_path(:user), class: 'btn btn-sign-in btn-new'
	17	+
	18	+ %ul.nav.navbar-nav
16	19	%li
17	20	%a
18	21	%div.hide.turbolink-spinner
19	22	%i.icon-refresh.icon-spin
20	23	Loading...
21		- %li
22		- = link_to "Sign in", new_session_path(:user), class: 'btn btn-sign-in'
...	...
...	...	@@ -15,7 +15,7 @@ module Gitlab
15	15	COLOR => "ui_color"
16	16	}
17	17
18		- id \|\|= 1
	18	+ id \|\|= Gitlab.config.gitlab.default_theme
19	19
20	20	return themes[id]
21	21	end
...	...