-
Notifications
You must be signed in to change notification settings - Fork 76
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
The inconsistent code styling and attribute order was making my head hurt looking for where things were set and it was too much to rewrite by hand. I ended up running everything through css tidy to normalize the order of properties and selectors, whitespace, value styles, etc. I opted not to have it optimize for shorthand values, merge duplicates, or any other options I thought would make it less readable. Since the output of csstidy is not indented, I tweaked the output to use one selector per line and re-indented the whole thing using vim's syntax plugin. Here is a quick vim script to duplicate the same results: :%!csstidy % --silent=true --preserve_css=true --sort_selectors=1 --merge_selectors=0 --compress_font-weight=false :%!sed '/{$/s/,/,\n/g' :%s/: */: /g :norm gg=G Note vim's indenting has issues after some kinds of comment blocks. The output was manually tweaked to correct that.
- Loading branch information
Showing
9 changed files
with
2,474 additions
and
2,398 deletions.
There are no files selected for viewing
Large diffs are not rendered by default.
Oops, something went wrong.
Large diffs are not rendered by default.
Oops, something went wrong.
Large diffs are not rendered by default.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,132 +1,140 @@ | ||
/* IMAGE LIBRARY */ | ||
|
||
.inline-icon { | ||
display: inline-block; | ||
width: 20px; | ||
height: 20px; | ||
cursor: pointer; | ||
border-radius: 4px; | ||
margin-right: 5px; | ||
opacity: .5; | ||
background-size: 20px 20px; | ||
display: inline-block; | ||
width: 20px; | ||
height: 20px; | ||
cursor: pointer; | ||
border-radius: 4px; | ||
margin-right: 5px; | ||
opacity: .5; | ||
background-size: 20px 20px; | ||
} | ||
|
||
.image-icon { | ||
background-image: url(images/pictures.svg); | ||
background-image: url(images/pictures.svg); | ||
} | ||
|
||
.map-icon { | ||
background-image: url(images/map.svg); | ||
background-image: url(images/map.svg); | ||
} | ||
|
||
.inline-image-library-thumbs, | ||
.inline-video-library-thumbs { | ||
margin:0; | ||
padding:0; | ||
list-style-type:none; | ||
margin: 0; | ||
padding: 0; | ||
list-style-type: none; | ||
} | ||
|
||
.inline-image-library-thumbs li, | ||
.inline-video-library-thumbs li { | ||
|
||
display:block; | ||
width:60px; | ||
height:60px; | ||
float:left; | ||
text-align:center; | ||
margin:0 10px 10px 0; | ||
display: block; | ||
width: 60px; | ||
height: 60px; | ||
float: left; | ||
text-align: center; | ||
margin: 0 10px 10px 0; | ||
} | ||
|
||
.inline-image-library-thumbs li img, | ||
.inline-video-library-thumbs li img { | ||
display:inline; | ||
cursor:pointer; | ||
max-width:60px; | ||
max-height:60px; | ||
display: inline; | ||
cursor: pointer; | ||
max-width: 60px; | ||
max-height: 60px; | ||
} | ||
|
||
.image-library-thumbs { | ||
margin:0; | ||
padding:0; | ||
list-style-type:none; | ||
margin: 0; | ||
padding: 0; | ||
list-style-type: none; | ||
} | ||
|
||
.image-library-thumbs li a { | ||
display: block; | ||
text-decoration: none; | ||
color: #333; | ||
line-height: 1; | ||
position: relative; | ||
display: block; | ||
text-decoration: none; | ||
color: #333; | ||
line-height: 1; | ||
position: relative; | ||
} | ||
.image-library-thumbs li a:hover { | ||
color: #2a85e8; | ||
|
||
.image-library-thumbs li a: hover { | ||
color: #2a85e8; | ||
} | ||
.image-library-thumbs li a:hover img { | ||
border: solid 2px #2a85e8; | ||
|
||
.image-library-thumbs li a: hover img { | ||
border: solid 2px #2a85e8; | ||
} | ||
|
||
.image-library-thumbs li { | ||
display:block; | ||
width:100px; | ||
height:115px; | ||
float:left; | ||
text-align:center; | ||
margin:0 15px 20px 0; | ||
display: block; | ||
width: 100px; | ||
height: 115px; | ||
float: left; | ||
text-align: center; | ||
margin: 0 15px 20px 0; | ||
} | ||
|
||
.image-library-thumbs li img { | ||
display:inline; | ||
cursor:pointer; | ||
max-width:100px; | ||
max-height:100px; | ||
border: solid 2px transparent; | ||
display: inline; | ||
cursor: pointer; | ||
max-width: 100px; | ||
max-height: 100px; | ||
border: solid 2px transparent; | ||
} | ||
|
||
.image-library-thumbs li span { | ||
display:block; | ||
cursor:pointer; | ||
height: 15px; | ||
padding: 2px; | ||
font-size: 10px; | ||
text-align: center; | ||
display: block; | ||
cursor: pointer; | ||
height: 15px; | ||
padding: 2px; | ||
font-size: 10px; | ||
text-align: center; | ||
} | ||
|
||
.verse-images { | ||
clear: both; | ||
margin: 0 0 2em 0; | ||
overflow: hidden; | ||
clear: both; | ||
margin: 0 0 2em; | ||
overflow: hidden; | ||
} | ||
|
||
.verse-images h2 { | ||
text-align: left; | ||
text-align: left; | ||
} | ||
|
||
.big-image { | ||
position: absolute; | ||
z-index: 100; | ||
position: absolute; | ||
z-index: 100; | ||
} | ||
|
||
/* Video */ | ||
.video-icon { | ||
background-image: url(images/video.svg); | ||
background-image: url(images/video.svg); | ||
} | ||
.image-library-thumbs li span.media-video-play { | ||
/* | ||
position: absolute; | ||
top: 20px; | ||
left: 40px; | ||
background: transparent; | ||
|
||
display: block; | ||
border-style: solid; | ||
border-width: 10px 0 10px 20px; | ||
border-color: transparent transparent transparent #fff; | ||
*/ | ||
.image-library-thumbs li span.media-video-play { | ||
/* | ||
position: absolute; | ||
top: 20px; | ||
left: 40px; | ||
background: transparent; | ||
position: absolute; | ||
display: block; | ||
top: 20px; | ||
left: 40px; | ||
background: transparent; | ||
width: 20px; | ||
height: 20px; | ||
background: transparent url(images/video-icon-overlay.svg) center center no-repeat; | ||
display: block; | ||
border-style: solid; | ||
border-width: 10px 0 10px 20px; | ||
border-color: transparent transparent transparent #fff; | ||
*/ | ||
position: absolute; | ||
display: block; | ||
top: 20px; | ||
left: 40px; | ||
background: transparent; | ||
width: 20px; | ||
height: 20px; | ||
background: transparent url(images/video-icon-overlay.svg) center center no-repeat; | ||
} | ||
|
||
|
||
|
||
/* Eng 2p Texan */ | ||
#config-eng2p th, config-eng2p td { | ||
text-align: left; | ||
|
||
#config-eng2p th, | ||
config-eng2p td { | ||
text-align: left; | ||
} |
Oops, something went wrong.
9884e1a
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I'm finding that something in this commit is leading to Safari and Chrome moving really slowly. When a resize is triggered (adding/deleting a window, resizing the browser, etc.) it takes a long time for it to re-render. Any ideas on what changes csstidy might have made?
9884e1a
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@johndyer I'm looking into it.
9884e1a
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@johndyer At least one thing in here is broken by my manual tweak after CSSTidy. I added spaces after property keys, but they got applied to pseudo-selectors as well which is invalid. Sorry about that, I'll work on a fix and see if the render issues are related.
9884e1a
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@johndyer I made two sets of corrections related to this (3ef63d6 and 419d15b) in addition to yours (df2c0dc). However I cannot confirm if any of that addresses the rendering issue you were seeing in Safari/Chrome because I cannot duplicate the result, even on the "bad" commits. I don't have Safari handy today (I will tomorrow) but Chrome is not giving me any trouble like you are describing.
If this is still something you're seeing can you open it as an issue report with some details like the version of Chrome you are testing with, whether it matters what the content is, whether it still happens after clearing all your preferences (run the app in incognito/privacy mode) and whether running it off of file:/// vs. inside a node server makes any difference?
9884e1a
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
See #37.