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

Merge branch 'v3'

Browse Source 
Conflicts:
	builds/crx/script.js
This commit is contained in:
Zixaphir 2013-12-06 17:25:36 -07:00
commit e5e8d3b564
6 changed files with 29 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
builds/4chan-X.user.js
View File

File diff suppressed because one or more lines are too long

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

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

@ -265,18 +265,18 @@ th {
.fixed #header-bar { .fixed #header-bar {
position: fixed; position: fixed;
} }
.top #header-bar { .top-header #header-bar {
top: 0; top: 0;
border-top-width: 0; border-top-width: 0;
} }
.rounded-edges.top #header-bar { .rounded-edges.top-header #header-bar {
border-radius: 0 0 3px 3px; border-radius: 0 0 3px 3px;
} }
.fixed.bottom #header-bar { .fixed.bottom-header #header-bar {
bottom: 0; bottom: 0;
border-bottom-width: 0; border-bottom-width: 0;
} }
.rounded-edges.bottom #header-bar { .rounded-edges.bottom-header #header-bar {
border-radius: 3px 3px 0 0; border-radius: 3px 3px 0 0;
} }
.hide #header-bar { .hide #header-bar {
@ -289,11 +289,11 @@ th {
box-shadow: none; box-shadow: none;
transition: all .8s .6s cubic-bezier(.55, .055, .675, .19); transition: all .8s .6s cubic-bezier(.55, .055, .675, .19);
} }
.fixed.top #header-bar.autohide:not(:hover) { .fixed.top-header #header-bar.autohide:not(:hover) {
margin-bottom: -1em; margin-bottom: -1em;
<%= transform %>: translateY(-100%); <%= transform %>: translateY(-100%);
} }
.fixed.bottom #header-bar.autohide:not(:hover) { .fixed.bottom-header #header-bar.autohide:not(:hover) {
<%= transform %>: translateY(100%); <%= transform %>: translateY(100%);
} }
#scroll-marker { #scroll-marker {
@ -308,10 +308,10 @@ th {
.fixed #header-bar #scroll-marker { .fixed #header-bar #scroll-marker {
display: block; display: block;
} }
.fixed.top header-bar #scroll-marker { .fixed.top-header header-bar #scroll-marker {
top: 100%; top: 100%;
} }
.fixed.bottom #header-bar #scroll-marker { .fixed.bottom-header #header-bar #scroll-marker {
bottom: 100%; bottom: 100%;
} }
/* Notifications */ /* Notifications */
@ -323,7 +323,7 @@ th {
left: 0; left: 0;
transition: all .8s .6s cubic-bezier(.55, .055, .675, .19); transition: all .8s .6s cubic-bezier(.55, .055, .675, .19);
} }
.fixed.top #header-bar #notifications { .fixed.top-header #header-bar #notifications {
position: absolute; position: absolute;
top: 100%; top: 100%;
} }
@ -1426,7 +1426,7 @@ input:checked + .rice {
:root:not(.post-form-style-float) #qr { :root:not(.post-form-style-float) #qr {
bottom: 0 !important; bottom: 0 !important;
} }
.fourchan-ss-navigation.fixed.bottom:not(.post-form-style-float) #qr, .fourchan-ss-navigation.fixed.bottom-header:not(.post-form-style-float) #qr,
.fourchan-ss-navigation.index.pagination-sticky-bottom:not(.post-form-style-float) #qr { .fourchan-ss-navigation.index.pagination-sticky-bottom:not(.post-form-style-float) #qr {
bottom: 1.5em !important; bottom: 1.5em !important;
} }
@ -1846,7 +1846,7 @@ a:only-of-type > .remove {
.sidebar-location-right.mascot-location-opposite #mascot img { .sidebar-location-right.mascot-location-opposite #mascot img {
<%= transform %>: scaleX(-1); <%= transform %>: scaleX(-1);
} }
.fourchan-ss-navigation.bottom.fixed #mascot, .fourchan-ss-navigation.bottom-header.fixed #mascot,
.fourchan-ss-navigation.index.pagination-sticky-bottom #mascot { .fourchan-ss-navigation.index.pagination-sticky-bottom #mascot {
bottom: 1.5em bottom: 1.5em
} }

8
src/General/css/padding.nav.css
View File

@ -1,15 +1,15 @@
body { body {
padding-bottom: 1px; padding-bottom: 1px;
} }
.fourchan-ss-navigation.fixed.top:not(.autohide) body::before { .fourchan-ss-navigation.fixed.top-header:not(.autohide) body::before {
top: #{navHeight}px; top: #{navHeight}px;
} }
.fourchan-ss-navigation.fixed.bottom:not(.autohide) body::before { .fourchan-ss-navigation.fixed.bottom-header:not(.autohide) body::before {
bottom: #{navHeight}px; bottom: #{navHeight}px;
} }
.top:not(.autohide) body { .top-header:not(.autohide) body {
padding-top: #{navHeight + 1}px; padding-top: #{navHeight + 1}px;
} }
.bottom:not(.autohide) body { .bottom-header:not(.autohide) body {
padding-bottom: #{navHeight + 1}px; padding-bottom: #{navHeight + 1}px;
} }

18
src/General/css/style.css
View File

@ -115,10 +115,10 @@ a {
z-index: 10; z-index: 10;
} }
/* Header */ /* Header */
.fixed.top body { .fixed.top-header body {
padding-top: 2em; padding-top: 2em;
} }
.fixed.bottom body { .fixed.bottom-header body {
padding-bottom: 2em; padding-bottom: 2em;
} }
.fixed #header-bar { .fixed #header-bar {
@ -126,10 +126,10 @@ a {
left: 0; left: 0;
padding: 3px 4px 4px; padding: 3px 4px 4px;
} }
.fixed.top #header-bar { .fixed.top-header #header-bar {
top: 0; top: 0;
} }
.fixed.bottom #header-bar { .fixed.bottom-header #header-bar {
bottom: 0; bottom: 0;
} }
#header-bar { #header-bar {
@ -147,7 +147,7 @@ a {
position: relative; position: relative;
left: 150px; left: 150px;
} }
.fixed.top #header-bar { .fixed.top-header #header-bar {
border-bottom-width: 1px; border-bottom-width: 1px;
} }
.fixed.bottom #header-bar { .fixed.bottom #header-bar {
@ -165,7 +165,7 @@ a {
box-shadow: none; box-shadow: none;
transition: all .8s .6s cubic-bezier(.55, .055, .675, .19); transition: all .8s .6s cubic-bezier(.55, .055, .675, .19);
} }
.fixed.top #header-bar.autohide:not(:hover) { .fixed.top-header #header-bar.autohide:not(:hover) {
margin-bottom: -1em; margin-bottom: -1em;
-webkit-transform: translateY(-100%); -webkit-transform: translateY(-100%);
transform: translateY(-100%); transform: translateY(-100%);
@ -189,10 +189,10 @@ a {
.fixed #header-bar #scroll-marker { .fixed #header-bar #scroll-marker {
display: block; display: block;
} }
.fixed.top #header-bar #scroll-marker { .fixed.top-header #header-bar #scroll-marker {
top: 100%; top: 100%;
} }
.fixed.bottom #header-bar #scroll-marker { .fixed.bottom-header #header-bar #scroll-marker {
bottom: 100%; bottom: 100%;
} }
#header-bar a:not(.entry):not(.close) { #header-bar a:not(.entry):not(.close) {
@ -249,7 +249,7 @@ a {
left: 0; left: 0;
transition: all .8s .6s cubic-bezier(.55, .055, .675, .19); transition: all .8s .6s cubic-bezier(.55, .055, .675, .19);
} }
.fixed.top #header-bar #notifications { .fixed.top-header #header-bar #notifications {
position: absolute; position: absolute;
top: 100%; top: 100%;
} }