Commit e1b506ae authored by yPhil's avatar yPhil
Browse files

Merge branch 'layout' into dev

parents 4a5db4dc 842c217a
......@@ -6,7 +6,7 @@
}
body {
background-color: var(--bg-color-tri) !important;
background-color: var(--bg-color-ter) !important;
}
li.ui-tabs-active,
......@@ -150,16 +150,6 @@ button#donate {
margin: 0 !important;
}
.handle {
opacity: 0.6;
color: var(--ui-color-sec) !important;
}
.handle:hover {
opacity: 1;
color: var(--ui-color-sec) !important;
}
.ui-button:active,
.ui-button.ui-state-active:hover {
background-color: #FFD05B !important;
......@@ -215,10 +205,6 @@ button#donate {
animation: fadeIn ease 6s;
}
#newTabButton:hover {
color: #FFDC00 !important;
}
@keyframes fadeIn {
0% {
opacity:0;
......@@ -530,7 +516,7 @@ button > i {
display: flex;
text-align:right;
background-color: var(--bg-color-sec) !important;
background-color: var(--color-qua) !important;
/* padding:.2rem; */
/* min-width:80px; */
......@@ -560,11 +546,11 @@ button > i {
top: 0;
left: 0;
border-bottom: 26px solid var(--bg-color-pri);
border-right: 18px solid var(--bg-color-sec);
border-right: 24px solid var(--color-qua);
}
.mobHeader .feedControls div {
margin:1px 1px 1px 0;
margin: 1px 1px 1px 0;
flex: 1 100%;
}
......@@ -588,32 +574,45 @@ button > i {
border-radius: 0;
}
li.mobTab,
#newTabButton {
box-shadow: inset 14px 0px 10px -3px rgba(0,0,0,0.19) !important;
}
#newTabButton {
background-color: var(--color-qua);
.handle {
opacity: 0.6;
}
#newTabButton:hover,
.handle:hover {
opacity: 1;
color: var(--color-tri);
color: var(--ui-color-sec) !important;
}
.handle,
#newTabButton a:link {
color: var(--ui-color-sec) !important;
}
#newTabButton {
background-color: var(--color-qua);
}
#newTabButton:hover {
background-color: var(--bg-color-pri) !important;
box-shadow: none !important;
}
#newTabButton a:hover {
background-color: var(--ui-bg-color-pri);
}
li.mobTab,
#newTabButton {
box-shadow: inset 14px 0px 10px -3px rgba(0,0,0,0.19) !important;
}
li.ui-tabs-active,
div.ui-tabs-panel {
background-color: var(--bg-color-tri) !important;
background-color: var(--bg-color-ter) !important;
}
li.ui-state-hover:not(.ui-tabs-active) {
background-color: var(--bg-color-pri) !important;
background-color: var(--bg-color-ter) !important;
}
.ui-state-error {
......@@ -676,7 +675,3 @@ li.feedItem a:visited {
.fancybox-thumbs {
background-color: var(--bg-color-qua) !important;
}
.arrow {
background-image: url("/static/images/feed-toggle-triangle-fff.png") !important;
}
:root {
--bg-color-tri: #DDE0FA;
--bg-color-qua: #e3eff3;
--bg-color-pri: #C3DCD9;
--bg-color-sec: #eeeeee;
--bg-color-ter: #DDE0FA;
--bg-color-qua: #e3eff3;
--color-pri: #3C4440;
--color-sec: #5294E2;
--color-tri: #FFDC00;
--color-qua: #DDE0FA;
--color-qua: #7395AE;
--color-danger: #660000;
}
.arrow {
background-image: url("/static/images/feed-toggle-triangle-000.png") !important;
}
:root {
--bg-color-tri: #7C818C;
--bg-color-qua: #404552;
--bg-color-pri: #383C4A;
--bg-color-sec: #4B5162;
--bg-color-ter: #7C818C;
--bg-color-qua: #404552;
--color-pri: #eeeeee;
--color-sec: #dddddd;
--color-tri: #FFDC00;
--color-qua: #7395AE;
--color-danger: #660000;
}
.arrow {
background-image: url("/static/images/feed-toggle-triangle-fff.png") !important;
}
......@@ -85,8 +85,8 @@ MOB.feed = {
$controlsToggleDiv.click(function() {
console.log('click: (%s)', $(this).parent().attr('class'));
// $(this).parent().animate({'left': '0'}, 1000);
// $('.feedControls').removeClass('openControls');
$(this).parent().toggleClass('openControls');
});
$header.hover (
......
<div id="killDialog">
<p class="dialog-warning">
<p class="ui dialog-warning">
<img class="icon-warning" alt="Petrolette attention!" src="/static/images/icon-flamable.png"/>
</p>
</div>
<div id="questionDialog" title="Just answer the question">
<p>
<p class="ui">
Yo!
</p>
</div>
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment