Browse Source

ui tweeks

pull/1/head
Nicolae Claudius 13 years ago
parent
commit
4dcbf0cb26
  1. 0
      app/assets/images/theme/arrow.png
  2. 0
      app/assets/images/theme/bgd.jpg
  3. 0
      app/assets/images/theme/boxbar-background.png
  4. 0
      app/assets/images/theme/button-background-active.png
  5. 0
      app/assets/images/theme/button-background.png
  6. 6
      app/assets/stylesheets/marketing.css.scss
  7. 2
      app/assets/stylesheets/overrides.css.erb
  8. 22
      app/assets/stylesheets/theme/default.css.erb

0
app/assets/images/arrow.png → app/assets/images/theme/arrow.png

Before

Width:  |  Height:  |  Size: 349 B

After

Width:  |  Height:  |  Size: 349 B

0
app/assets/images/bgd.jpg → app/assets/images/theme/bgd.jpg

Before

Width:  |  Height:  |  Size: 1.9 KiB

After

Width:  |  Height:  |  Size: 1.9 KiB

0
app/assets/images/boxbar-background.png → app/assets/images/theme/boxbar-background.png

Before

Width:  |  Height:  |  Size: 6.0 KiB

After

Width:  |  Height:  |  Size: 6.0 KiB

0
app/assets/images/button-background-active.png → app/assets/images/theme/button-background-active.png

Before

Width:  |  Height:  |  Size: 6.0 KiB

After

Width:  |  Height:  |  Size: 6.0 KiB

0
app/assets/images/button-background.png → app/assets/images/theme/button-background.png

Before

Width:  |  Height:  |  Size: 6.0 KiB

After

Width:  |  Height:  |  Size: 6.0 KiB

6
app/assets/stylesheets/marketing.css.scss

@ -55,10 +55,10 @@
// @include slick-black;
@include cupid-green;
width: 300px;
height: 60px;
width: 250px;
height: 50px;
margin: auto;
font-family: "MuseoSans500", helvetica, arial, sans-serif;
font-family: "Helvetica Neue", Helvetica, Arial, sans-serif;
strong {
font-size: 18px;
font-weight: bold;

2
app/assets/stylesheets/overrides.css.erb

@ -20,5 +20,5 @@ body.errors #main .inner {
.flash .alert {
border: 1px solid #bb9004;
background: #f9c006 url(<%= asset_path("web-app-theme/themes/default/images/messages/warning.png") %>) no-repeat 10px center;
background: #f9c006 url(<%= asset_path("messages/warning.png") %>) no-repeat 10px center;
}

22
app/assets/stylesheets/theme/default.css → app/assets/stylesheets/theme/default.css.erb

@ -1,6 +1,6 @@
body {
color: #111111;
background: #c4c4c4 url("images/bgd.jpg");
background: #c4c4c4 url(<%= asset_path("theme/bgd.jpg") %>);
font-family: "Helvetica Neue", Helvetica, Arial, sans-serif;
}
@ -100,7 +100,7 @@ hr {
}
.secondary-navigation {
background: #e0e0e0 url("images/boxbar-background.png") top;
background: #e0e0e0 url(<%= asset_path("theme/boxbar-background.png") %>) top;
border-bottom-width: 0px;
-moz-border-radius-topleft: 6px;
-webkit-border-top-left-radius: 6px;
@ -214,7 +214,7 @@ hr {
#sidebar ul li {
background-position: 0 11px;
background-repeat: no-repeat;
background-image: url("images/arrow.png");
background-image: url(<%= asset_path("theme/arrow.png") %>);
border-bottom: 1px dashed #777777;
list-style-type: none;
}
@ -243,7 +243,7 @@ hr {
min-width: 15px;
text-align: center;
background: #dddddd;
background-image: url("images/button-background.png");
background-image: url(<%= asset_path("theme/button-background.png") %>);
color: #111111;
}
.pagination a:hover {
@ -259,7 +259,7 @@ hr {
}
.pagination a:active {
background-image: url("images/button-background-active.png");
background-image: url(<%= asset_path("theme/button-background-active.png") %>);
outline: none;
}
@ -332,17 +332,17 @@ hr {
}
.flash .error, .flash .error-list {
border: 1px solid #993624;
background: #cc4831 url("images/messages/error.png") no-repeat 10px center;
background: #cc4831 url(<%= asset_path("messages/error.png") %>) no-repeat 10px center;
}
.flash .warning {
border: 1px solid #bb9004;
background: #f9c006 url("images/messages/warning.png") no-repeat 10px center;
background: #f9c006 url(<%= asset_path("messages/warning.png") %> no-repeat 10px center;
}
.flash .notice {
color: #28485e;
text-shadow: 0 1px 0 rgba(255, 255, 255, 0.7);
border: 1px solid #8a9daa;
background: #b8d1e2 url("images/messages/notice.png") no-repeat 10px center;
background: #b8d1e2 url(<%= asset_path("messages/notice.png") %>)3 no-repeat 10px center;
}
.flash .error-list {
text-align: left;
@ -396,7 +396,7 @@ ul.list li .item .avatar {
}
a.button, button.button {
background: #edeeed url("images/button-background.png") top;
background: #edeeed url(<%= asset_path("theme/button-background.png") %>) top;
border: 1px solid #c3c4ba;
font-family: helvetica, arial, sans-serif;
font-weight: normal;
@ -409,11 +409,11 @@ a.button, button.button {
}
a.button:link, a.button:visited, a.button:hover, a.button:active, button.button:link, button.button:visited, button.button:hover, button.button:active {
font-weight: normal;
background: #edeeed url("images/button-background.png") top;
background: #edeeed url(<%= asset_path("theme/button-background.png") %>) top;
}
a.button:active, button.button:active {
background: #eaeaea url("images/button-background-active.png") top;
background: #eaeaea url(<%= asset_path("theme/button-background-active.png") %>) top;
outline: none;
margin-top: 1px;
margin-bottom: -1px;
Loading…
Cancel
Save