Skip to content

Commit 84edc5d

Browse files
committed
Modify admin css style
1 parent f737edb commit 84edc5d

File tree

3 files changed

+16
-17
lines changed

3 files changed

+16
-17
lines changed

app/assets/javascripts/admin/dashboard/template/index.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<div class="row" style="margin: 0 15px;">
1+
<div class="row">
22
<div class="col-md-4 dashboard-widget">
33
<div class="panel panel-blue statistics" ng-class="{'panel-loading': !dashboard}">
44
<div ng-show="dashboard">

app/assets/stylesheets/admin.css.scss

Lines changed: 14 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -168,24 +168,26 @@ textarea {
168168
// 导航栏
169169
.navbar-admin {
170170
border: 0;
171+
padding: 0 30px;
172+
z-index: 10;
171173

172174
// 标题
173175
.navbar-brand {
174-
color: $red;
175-
font-weight: bolder;
176-
font-size: 32px;
176+
// color: $red;
177+
// font-weight: bolder;
178+
// font-size: 32px;
177179
line-height: 50px;
178-
margin: 0 20px;
180+
// margin-right: 20px;
179181
padding: 0;
180182

181183
&:hover {
182-
color: $blue
184+
// color: $blue
183185
}
184186
}
185187

186188
// 最右扳手
187189
.navbar-right {
188-
margin-right: 15px !important;
190+
margin-right: 0px !important;
189191

190192
.dropdown > a {
191193
padding: 0 15px;
@@ -207,21 +209,18 @@ textarea {
207209
// ajax 指示器
208210
.ajax-spinner {
209211
position: absolute;
210-
top: 18px;
212+
top: 12px;
211213
left: 50%;
212214
width: 300px;
213215
margin-left: -150px;
214216
border-radius: 0 0 5px 5px;
215217
color: #c09853;
216218
text-align: center;
217-
padding: 5px 0;
219+
padding: 8px 0;
218220
background: #FCF6CF;
219221
box-shadow: 0 1px 5px rgba(0, 0, 0, 0.3);
220-
z-index: -1;
221-
222-
//-webkit-transition: all cubic-bezier(0.68, -0.55, 0.265, 1.55) 0.5s;
222+
z-index: 1;
223223
@include transition(all cubic-bezier(0.68, -0.55, 0.265, 1.55) 0.5s);
224-
clip: auto;
225224

226225
.icon-spin {
227226
-webkit-animation: spin 0.7s infinite linear;
@@ -235,10 +234,10 @@ textarea {
235234

236235
.main {
237236
position: absolute;
238-
top: 90px;
237+
top: 80px;
239238
bottom: 10px;
240-
left: 15px;
241-
right: 15px;
239+
left: 30px;
240+
right: 30px;
242241
}
243242

244243
.full-height {

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@
3232
<nav class="navbar navbar-inverse navbar-admin" ng-controller="nav">
3333
<div class="navbar-header">
3434
<a class="navbar-brand" href="/admin">
35-
<%= image_tag 'logo.png', :height=>40 %>
35+
<%= image_tag 'logo.png', :height => 40 %>
3636
</a>
3737
</div>
3838
<ul class="nav navbar-nav">

0 commit comments

Comments
 (0)