Skip to content

Commit 86c759b

Browse files
committed
Moved sass folder; styles for markdown in Funnel.
1 parent 0e6956f commit 86c759b

12 files changed

+16
-25
lines changed

config.rb

+2-2
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@
22
# Set this to the root of your project when deployed:
33
http_path = "/"
44
css_dir = "lastuserapp/static/css"
5-
sass_dir = "sass"
5+
sass_dir = "lastuserapp/static/sass"
66
images_dir = "lastuserapp/static/img"
77
javascripts_dir = "lastuserapp/static/js"
88
line_comments = false
99
# To enable relative paths to assets via compass helper functions. Uncomment:
10-
# relative_assets = true
10+
relative_assets = true

lastuserapp/static/css/screen.css

+7-13
Original file line numberDiff line numberDiff line change
@@ -314,7 +314,7 @@ footer #footer_content {
314314
text-indent: -119988px;
315315
overflow: hidden;
316316
text-align: left;
317-
background-image: url('/static/img/logo.png?1305301303');
317+
background-image: url('../img/logo.png?1305301303');
318318
background-repeat: no-repeat;
319319
background-position: 50% 50%;
320320
width: 100px;
@@ -576,7 +576,7 @@ img.login_avatar {
576576
text-indent: -119988px;
577577
overflow: hidden;
578578
text-align: left;
579-
background-image: url('/static/img/home.png?1307204489');
579+
background-image: url('../img/home.png?1307204489');
580580
background-repeat: no-repeat;
581581
background-position: 12 22;
582582
width: 12px;
@@ -884,7 +884,7 @@ select {
884884
}
885885

886886
input[name="openid"] {
887-
background: url('/static/img/openid.png?1305572482') 4px no-repeat;
887+
background: url('../img/openid.png?1305572482') 4px no-repeat;
888888
width: 230px;
889889
padding-left: 25px;
890890
}
@@ -944,7 +944,7 @@ input[type="submit"].delete:hover {
944944

945945
span.loading {
946946
display: inline-block;
947-
background: url('/static/img/ajax-loader.gif?1305733694') center no-repeat;
947+
background: url('../img/ajax-loader.gif?1305733694') center no-repeat;
948948
width: 16px;
949949
height: 16px;
950950
}
@@ -1389,7 +1389,7 @@ div.field.small div.preview-control {
13891389
width: 35em;
13901390
}
13911391

1392-
div.preview-block, div.markdown-field a {
1392+
div.preview-block, div.markdown-field a.button {
13931393
border: 1px solid #b7b7b7;
13941394
-moz-border-radius: 3px;
13951395
-webkit-border-radius: 3px;
@@ -1406,24 +1406,18 @@ div.preview-block {
14061406
}
14071407

14081408
div.markdown-field {
1409-
float: right;
14101409
margin: 0 8% 5px 0;
1411-
font-size: 80%;
14121410
}
14131411

1414-
div.markdown-field a {
1412+
div.markdown-field a.button {
14151413
padding: 3px;
14161414
background: #DF5E0E;
14171415
margin-bottom: 15px;
14181416
text-decoration: none;
14191417
color: #fff;
1420-
}
1421-
1422-
div.markdown-field .button {
14231418
opacity: 0.7;
14241419
}
1425-
1426-
div.markdown-field .button.selected {
1420+
div.markdown-field a.button.selected {
14271421
opacity: 1;
14281422
}
14291423

File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.

sass/_layout.scss lastuserapp/static/sass/_layout.scss

+7-10
Original file line numberDiff line numberDiff line change
@@ -908,7 +908,7 @@ div.field div.preview-control {
908908
div.field.small div.preview-control {
909909
width: 35em;
910910
}
911-
div.preview-block, div.markdown-field a {
911+
div.preview-block, div.markdown-field a.button {
912912
border: 1px solid #b7b7b7;
913913
-moz-border-radius: 3px;
914914
-webkit-border-radius: 3px;
@@ -923,24 +923,21 @@ div.preview-block {
923923
padding: 5px;
924924
}
925925
div.markdown-field{
926-
float: right;
926+
// float: right;
927927
margin: 0 8% 5px 0;
928-
font-size: 80%;
928+
// font-size: 80%;
929929
}
930-
div.markdown-field a{
930+
div.markdown-field a.button {
931931
padding: 3px;
932932
background: #DF5E0E;
933933
margin-bottom: 15px;
934934
text-decoration: none;
935935
color: #fff;
936-
}
937-
div.markdown-field .button{
938936
opacity: 0.7;
937+
&.selected {
938+
opacity: 1;
939+
}
939940
}
940-
div.markdown-field .button.selected{
941-
opacity: 1;
942-
}
943-
944941

945942
/* Spam protection */
946943
.z {
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.

0 commit comments

Comments
 (0)