Skip to content

Commit bfb9389

Browse files
committed
Modify logo
1 parent 2bb48bb commit bfb9389

File tree

4 files changed

+43
-27
lines changed

4 files changed

+43
-27
lines changed

app/assets/images/logo.png

-2.14 KB
Loading

app/assets/stylesheets/admin.css.scss

Lines changed: 41 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -91,6 +91,7 @@ textarea {
9191
margin-left: 10px;
9292
}
9393

94+
// 导航栏
9495
.nav-tabs.nav-stacked {
9596
border-bottom: 0;
9697
}
@@ -171,38 +172,55 @@ textarea {
171172
padding: 0 30px;
172173
z-index: 10;
173174

174-
// 标题
175+
.navbar-header {
176+
width: 140px;
177+
height: 1px;
178+
}
179+
180+
// logo
175181
.navbar-brand {
176-
// color: $red;
177-
// font-weight: bolder;
178-
// font-size: 32px;
179-
line-height: 50px;
180-
// margin-right: 20px;
181-
padding: 0;
182-
width: 110px;
182+
background: asset-url('logo.png') no-repeat 0 center;
183+
position: absolute;
184+
width: 140px;
185+
height: 70px;
183186

184187
&:hover {
185-
// color: $blue
188+
background-position: -140px center;
186189
}
190+
187191
}
188192

189-
// 最右扳手
190-
.navbar-right {
191-
margin-right: 0px !important;
193+
// 标题
194+
// .navbar-brand {
195+
// color: $red;
196+
// font-weight: bolder;
197+
// font-size: 32px;
198+
// line-height: 50px;
199+
// margin-right: 20px;
200+
// padding: 0;
201+
// width: 110px;
202+
203+
// &:hover {
204+
// color: $blue
205+
// }
206+
}
192207

193-
.dropdown > a {
194-
padding: 0 15px;
195-
font-size: 1.5em;
196-
line-height: 50px;
197-
}
208+
// 最右扳手
209+
.navbar-right {
210+
margin-right: 0px !important;
198211

199-
.dropdown-menu li {
200-
height: 30px;
201-
line-height: 30px;
212+
.dropdown > a {
213+
padding: 0 15px;
214+
font-size: 1.5em;
215+
line-height: 50px;
216+
}
202217

203-
i {
204-
width: 18px;
205-
}
218+
.dropdown-menu li {
219+
height: 30px;
220+
line-height: 30px;
221+
222+
i {
223+
width: 18px;
206224
}
207225
}
208226
}

app/assets/stylesheets/admin/_dashboard.css.scss

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
padding: 10px 20px;
77

88
h2 {
9-
margin: 5px 0;
9+
margin: 5px 0 10px 0;
1010
font-size: 20px;
1111
}
1212

app/views/admin/home/show.html.erb

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -31,9 +31,7 @@
3131

3232
<nav class="navbar navbar-inverse navbar-admin" ng-controller="nav">
3333
<div class="navbar-header">
34-
<a class="navbar-brand" href="/admin">
35-
<%= image_tag 'logo.png', :height => 40 %>
36-
</a>
34+
<a class="navbar-brand" href="/admin" style="width: 140px;"></a>
3735
</div>
3836
<ul class="nav navbar-nav">
3937
<li ng-class="{active:item.active}" ng-repeat="item in navItems">

0 commit comments

Comments
 (0)