Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Add Dark Theme #394

Open
wants to merge 4 commits into
base: master
Choose a base branch
from
Open

Add Dark Theme #394

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
502432c
Add Dark Mode
Jatana Oct 26, 2018
99cf404
Prettify dark mode toggler
Jatana Oct 26, 2018
55e8068
New line
Jatana Oct 26, 2018
5e83dc8
Styles improvements
Jatana Oct 26, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
165 changes: 147 additions & 18 deletions ide/static/css/style.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,16 +14,21 @@ body {
}

#sidebar {
position: fixed;
top: 0px;
left: 0px;
bottom: 0px;
width: 20%;
background-color: #F3F3F3;
transition: 0.3s;
position: fixed;
top: 0px;
left: 0px;
bottom: 0px;
width: 20%;
background-color: #F3F3F3;
}
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Add new line

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Fixed 55e8068.

.app-dark #sidebar {
background-color: #455A64;
}
#sidebar-scroll {
height: calc(100% - 50px);
overflow-y: auto;
overflow-x: hidden;
}
#sidebar-content{
padding: 0 5% 0 5%;
Expand All @@ -36,12 +41,20 @@ body {
padding: 10px 0px 10px 0px;
}

.app-dark .sidebar-heading {
color: white;
}

.sidebar-badge{
padding: 10px;
border-radius: 3px;
margin-right: 10px;
}

.app-dark .sidebar-badge {
border: 1px solid #929292;
}

.sidebar-dropdown{
float: right;
color: #9ea2a9;
Expand All @@ -59,8 +72,10 @@ body {
}

#main {
transition: 0.3s;
background-color: white;
overflow: hidden;
width: 80%;
width: calc(80% + 12px);
display: flex;
flex-flow: column;
top: 0px;
Expand All @@ -69,6 +84,9 @@ body {
position: absolute;
}

.app-dark #main {
background-color: #263238;
}

.topBar .btn{
margin: 5px;
Expand All @@ -95,27 +113,37 @@ body {

.topbar-col {
flex: 1;
margin: 2px;
}

input#netName {
transition: 0.3s;
border: none;
position: absolute;
top: 0;
left: 0;
right: 0;
top: 15px;
right: 305px;
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Fix alignment of netName control it isn't placed in center of the canvas.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Fixed 5e83dc8.

width: 100%;
max-width: 30%;
max-width: 20%;
margin: auto;
text-align: center;
font-size: 2.5rem;
padding: 1rem;
font-size: 17px;
padding: 5px 7px;
outline: none;
z-index: 100;
background: transparent;
border-bottom: 2px solid;
background: #F3F3F3;
box-shadow: 0px 0px 11px 2px #F3F3F3;
// border-bottom: 2px solid;
border-color: #cdcfd2;
}

.app-dark input#netName {
background: #78909C;
color: white;
right: 273px;
box-shadow: none;
}

input#netName:focus {
border-color: #cdcfd2;
}
Expand Down Expand Up @@ -182,6 +210,14 @@ input#netName.hidden {
color: #333;
}

.app-dark .extra-buttons {
color: #F5F5F5;
}

.app-dark .glyphicon-menu-right {
color: white;
}


.panel-default > .panel-heading{
padding-left: 0px;
Expand All @@ -195,6 +231,9 @@ input#netName.hidden {
text-decoration: none;
color: #455062;
}
.app-dark .panel-heading > a {
color: white;
}
.panel-group{
padding-left: 8px;
padding-right: 8px;
Expand Down Expand Up @@ -263,11 +302,16 @@ input#netName.hidden {
}

#logo_back{
transition: 0.3s;
width: 100%;
margin: 0px;
background-color: #455062;
}

.app-dark #logo_back {
background-color: rgb(54, 71, 78);
}

#logo{
max-height: 50px;
margin: 0 auto;
Expand Down Expand Up @@ -318,17 +362,67 @@ input#netName.hidden {
outline: none;
}

#toggle-circle {
position: absolute;
width: 20px;
height: 20px;
top: 0px;
left: 0px;
border-radius: 100px;
background: white;
box-shadow: 0px 0px 1px 1px;
transition: 0.1s;
}

.app-dark #toggle-circle {
left: 30px;
}

.mode-toggle {
position: relative;
height: 20px;
margin-top: 20px;
}

.dark-mode-title {
text-align: left;
padding: 0px;
}

.btn-mode-toggle {
position: absolute;
top: 0px;
right: 0px;
width: 50px;
height: 20px;
display: inline;
padding: 7px 12px;
margin-left: 6px;
line-height: 1.42857143;
border-radius: 100px;
font-size: 14px;
background: rgb(205, 207, 210);
}

#btn-dark {
background-color: #CFD8DC;
}

.canvas{
flex: 1 1 auto;
width: 100%;
position: relative;
overflow: scroll;
// overflow: scroll;
border: 1px solid #ddd;
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why comment this?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Fixed 5e83dc8.

border-radius: 4px 4px 4px 4px;

/*background: yellow;*/
}

.app-dark .canvas {
border: none;
}

.setHead{
color: black;
background-color: #F3F3F3;
Expand All @@ -348,6 +442,11 @@ input#netName.hidden {
margin: 0px;
}

.app-dark .setHead {
color: white;
background-color: #455A64;
}

.paramsCheckbox label {
cursor: pointer;
position: absolute;
Expand All @@ -359,6 +458,10 @@ input#netName.hidden {
border-radius: 3px;
}

.app-dark .paramsCheckbox label {
background: #a4dfff !important;
}

.paramsCheckbox label:after {
opacity: 0.2;
content: '';
Expand Down Expand Up @@ -404,6 +507,10 @@ input#netName.hidden {
font-weight: bold;
}

.app-dark .drowpdown-button {
color: #F5F5F5;
}

.pane {
position: absolute;
left:50px;
Expand Down Expand Up @@ -568,12 +675,12 @@ button.url-import-modal-button {
margin-bottom: 0.5rem;
}

.setparams{
.setparams {
position: absolute;
background-color: white;
height: 100%;
width:20%;
min-width:250px;
min-width: 275px;
max-width: 400px;
color: black;
overflow: auto;
Expand All @@ -583,6 +690,11 @@ button.url-import-modal-button {
box-shadow: -5px 0px 10px #F3F3F3;
}

.app-dark .setparams {
background-color: #455A64;
box-shadow: none;
}

.setparamsActive{
transform: translateX(-103%);
}
Expand All @@ -591,6 +703,10 @@ button.url-import-modal-button {
cursor: pointer;
}

.app-dark .closeSign {
color: #a4dfff;
}


.tooltipField{
border: none;
Expand Down Expand Up @@ -740,7 +856,7 @@ button.url-import-modal-button {


.layer{
font-size: 22px;
font-size: 17px;
width: 130px;
padding: 5px 0px 5px 0px;
text-align: center;
Expand All @@ -752,6 +868,10 @@ button.url-import-modal-button {
cursor: pointer;
}

.app-dark .layer {
opacity: 0.9;
}

.selected{
box-shadow: 0px 0px 30px #aaa;
-o-box-shadow: 0px 0px 30px #aaa;
Expand Down Expand Up @@ -997,6 +1117,11 @@ input[type="file"] {
background-color: #F5F5F5;
}

.app-dark #sidebar-scroll::-webkit-scrollbar-track {
background-color: #455A64;
}


#sidebar-scroll::-webkit-scrollbar
{
width: 12px;
Expand All @@ -1008,6 +1133,10 @@ input[type="file"] {
background-color: #455062;
}

.app-dark #sidebar-scroll::-webkit-scrollbar-thumb {
background-color: #455A64;
}

#panZoomContainer::-webkit-scrollbar-track
{
background-color: #F5F5F5;
Expand Down
26 changes: 22 additions & 4 deletions ide/static/js/tabs.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,14 @@ class Tabs extends React.Component {
this.props.changeNetPhase(1);
}
});
$('#sidebar-scroll')[0].scrollLeft = 100;
$('.btn-mode-toggle').click(() => {
if (document.body.className.search('dark') == -1) {
document.body.className = 'app-dark';
} else {
document.body.className = '';
}
})
}
render() {
let trainClass = 'btn-primary',
Expand All @@ -22,10 +30,20 @@ class Tabs extends React.Component {
testClass = 'btn-primary';
}
return (
<li className="btn-group" role="group" id="phaseTabs">
<button type="button" id="train" className={"btn "+trainClass}>Train</button>
<button type="button" id="test" className={"btn "+testClass}>Test</button>
</li>
<div>
<li className="btn-group" role="group" id="phaseTabs">
<button type="button" id="train" className={"btn "+trainClass}>Train</button>
<button type="button" id="test" className={"btn "+testClass}>Test</button>
</li>
<div className="mode-toggle">
<div className="sidebar-heading dark-mode-title">
DARK MODE
</div>
<div className="btn-mode-toggle">
<div id="toggle-circle"></div>
</div>
</div>
</div>
);
}
}
Expand Down