Goyslop/4chan-x
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Revert flex changes.

Browse Source
This commit is contained in:
Zixaphir 2014-06-22 07:55:38 -07:00
parent ee841e6f44
commit ef4a4889d3
4 changed files with 34 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Gruntfile.coffee
View File

@ -151,12 +151,14 @@ module.exports = (grunt) ->
pkg.transform pkg.transform
] = if type is 'crx' then [ ] = if type is 'crx' then [
'-webkit-filter' '-webkit-filter'
'-webkit-flex'
'-webkit-order' '-webkit-order'
'-webkit-align' '-webkit-align'
'-webkit-justify-content' '-webkit-justify-content'
'-webkit-transform' '-webkit-transform'
] else [ ] else [
'filter' 'filter'
'flex'
'order' 'order'
'align' 'align'
'justify-content' 'justify-content'

4
builds/appchan-x.user.js
View File

File diff suppressed because one or more lines are too long

4
builds/crx/script.js
View File

File diff suppressed because one or more lines are too long

56
src/General/css/layout.css
View File

@ -511,11 +511,11 @@ nav a,
/* Shortcuts */ /* Shortcuts */
#shortcuts { #shortcuts {
position: fixed; position: fixed;
display: flex:; display: <%= flex %>;
top: 0; top: 0;
padding: 1px; padding: 1px;
z-index: 16; z-index: 16;
flex:-direction: row; <%= flex %>-direction: row;
max-height: 1.1em; max-height: 1.1em;
overflow: visible; overflow: visible;
} }
@ -528,7 +528,7 @@ nav a,
#a-icons, #a-icons,
#a-stats { #a-stats {
<%= order %>: 0; <%= order %>: 0;
display: flex:; display: <%= flex %>;
} }
#a-icons { #a-icons {
<%= order %>: 10; <%= order %>: 10;
@ -546,7 +546,7 @@ nav a,
<%= align %>-self: flex-end; <%= align %>-self: flex-end;
} }
.icon-orientation-vertical #a-icons { .icon-orientation-vertical #a-icons {
flex:-direction: column; <%= flex %>-direction: column;
height: 200px; height: 200px;
} }
.icon-orientation-horizontal #a-stats { .icon-orientation-horizontal #a-stats {
@ -555,11 +555,11 @@ nav a,
.icon-orientation-horizontal #a-stats, .icon-orientation-horizontal #a-stats,
.icon-orientation-horizontal #a-icons, .icon-orientation-horizontal #a-icons,
.sidebar-location-left #shortcuts { .sidebar-location-left #shortcuts {
flex:-direction: row-reverse; <%= flex %>-direction: row-reverse;
} }
.icon-orientation-horizontal.sidebar-location-left #a-stats, .icon-orientation-horizontal.sidebar-location-left #a-stats,
.icon-orientation-horizontal.sidebar-location-left #a-icons { .icon-orientation-horizontal.sidebar-location-left #a-icons {
flex:-direction: row; <%= flex %>-direction: row;
} }
#thread-stats { #thread-stats {
<%= order %>: 0; <%= order %>: 0;
@ -1262,10 +1262,10 @@ div.post div.postInfo {
display: inline-block; display: inline-block;
} }
.replyContainer { .replyContainer {
display: flex:; display: <%= flex %>;
} }
.fit-width-replies .reply.post { .fit-width-replies .reply.post {
flex:: 1 0; <%= flex %>: 1 0;
} }
.fit-width-replies .expanded-image .reply.post, .fit-width-replies .expanded-image .reply.post,
.fit-width-replies .hasInline .reply.post { .fit-width-replies .hasInline .reply.post {
@ -1756,12 +1756,12 @@ input:checked + .rice {
border-style: solid; border-style: solid;
} }
.persona { .persona {
display: flex:; display: <%= flex %>;
flex:-direction: column; <%= flex %>-direction: column;
<%= align %>-items: stretch; <%= align %>-items: stretch;
} }
.compact-post-form-inputs .persona { .compact-post-form-inputs .persona {
flex:-direction: row; <%= flex %>-direction: row;
} }
#qr textarea.field { #qr textarea.field {
height: 11.6em; height: 11.6em;
@ -1771,11 +1771,11 @@ input:checked + .rice {
height: 6em; height: 6em;
} }
.compact-post-form-inputs .persona input.field { .compact-post-form-inputs .persona input.field {
flex:: 1 1; <%= flex %>: 1 1;
margin: 0 0 0 1px; margin: 0 0 0 1px;
} }
.compact-post-form-inputs .persona input:focus { .compact-post-form-inputs .persona input:focus {
flex:: 3 1; <%= flex %>: 3 1;
} }
.compact-post-form-inputs .persona input.field:first-child { .compact-post-form-inputs .persona input.field:first-child {
margin: 0; margin: 0;
@ -1829,7 +1829,7 @@ input:not([type=radio]) {
vertical-align: bottom; vertical-align: bottom;
padding: 0 1px; padding: 0 1px;
outline: none; outline: none;
transition: color .25s, border-color .25s, flex: .25s; transition: color .25s, border-color .25s, <%= flex %> .25s;
} }
.selectrice { .selectrice {
padding-right: 1.6em; padding-right: 1.6em;
@ -1838,7 +1838,7 @@ input:not([type=radio]) {
min-width: 100%; min-width: 100%;
} }
#file-n-submit { #file-n-submit {
display: flex: display: <%= flex %>
} }
#qr [type='submit'] { #qr [type='submit'] {
width: 60px; width: 60px;
@ -1891,7 +1891,7 @@ input:not([type=radio]) {
display: inline-block; display: inline-block;
position: relative; position: relative;
margin-right: 1px; margin-right: 1px;
flex:: 1 1; <%= flex %>: 1 1;
overflow: hidden; overflow: hidden;
padding: 2px 1px 0; padding: 2px 1px 0;
} }
@ -2451,21 +2451,21 @@ article li {
left: 0; left: 0;
right: 0; right: 0;
z-index: 26; z-index: 26;
display: flex:; display: <%= flex %>;
flex:-direction: row; <%= flex %>-direction: row;
background: rgba(0,0,0,0.7); background: rgba(0,0,0,0.7);
} }
.gal-viewport { .gal-viewport {
display: flex:; display: <%= flex %>;
<%= align %>-items: stretch; <%= align %>-items: stretch;
flex:-direction: row; <%= flex %>-direction: row;
flex:: 1 1 auto; <%= flex %>: 1 1 auto;
} }
.gal-thumbnails { .gal-thumbnails {
flex:: 0 0 150px; <%= flex %>: 0 0 150px;
overflow-y: auto; overflow-y: auto;
display: flex:; display: <%= flex %>;
flex:-direction: column; <%= flex %>-direction: column;
<%= align %>-items: stretch; <%= align %>-items: stretch;
text-align: center; text-align: center;
background: rgba(0,0,0,.5); background: rgba(0,0,0,.5);
@ -2481,7 +2481,7 @@ article li {
width: auto; width: auto;
} }
.gal-thumb { .gal-thumb {
flex:: 0 0 auto; <%= flex %>: 0 0 auto;
padding: 3px; padding: 3px;
line-height: 0; line-height: 0;
transition: background .2s linear; transition: background .2s linear;
@ -2499,7 +2499,7 @@ article li {
} }
.gal-prev, .gal-prev,
.gal-next { .gal-next {
flex:: 0 0 20px; <%= flex %>: 0 0 20px;
position: relative; position: relative;
cursor: pointer; cursor: pointer;
opacity: 0.7; opacity: 0.7;
@ -2529,8 +2529,8 @@ article li {
} }
.gal-image { .gal-image {
order: 1; order: 1;
flex:: 1 0 auto; <%= flex %>: 1 0 auto;
display: flex:; display: <%= flex %>;
<%= align %>-items: flex-start; <%= align %>-items: flex-start;
<%= justify %>: space-around; <%= justify %>: space-around;
overflow: auto; overflow: auto;