Skip to content

Commit

Permalink
Merge pull request #8 from choorp/development
Browse files Browse the repository at this point in the history
Development
  • Loading branch information
Garrett committed Nov 20, 2016
2 parents 33aa542 + bb8c843 commit cfb8efb
Show file tree
Hide file tree
Showing 9 changed files with 432 additions and 34 deletions.
35 changes: 33 additions & 2 deletions css/app.css
Expand Up @@ -11,6 +11,16 @@
--divider-color: rgba(0,0,0,.1);
--sidebar-icon-color: rgba(255, 255, 255, 1);
--popup-icon-color: rgba(0, 0, 0, 0.54);
--card-header-color1: #FFCDD2;
--card-header-text-color1: black;
--card-header-color2: #BBDEFB;
--card-header-text-color2: black;
--card-header-color3: #C8E6C9;
--card-header-text-color3: black;
--card-header-color4: #E1BEE7;
--card-header-text-color4: black;
--card-header-color5: #CFD8DC;
--card-header-text-color5: black;
}

body {
Expand Down Expand Up @@ -151,7 +161,7 @@ body {
z-index: 2000;
display: none;
flex-direction: column;
padding: 10px;
padding: 2px;
}

.theme-builder input {
Expand All @@ -171,7 +181,24 @@ body {

.theme-settings {
flex: 1;
overflow: scroll;
overflow-y: scroll;
}
.theme-settings::-webkit-scrollbar {
width: 3px;
}
.theme-settings::-webkit-scrollbar-track {
-webkit-box-shadow: inset 0 0 6px rgba(0,0,0,0.1);
-webkit-border-radius: 4px;
border-radius: 4px;
}
.theme-settings::-webkit-scrollbar-thumb {
-webkit-border-radius: 4px;
border-radius:4px;
background: rgba(255,255,255,.5);
-webkit-box-shadow: inset 0 0 6px rgba(0,0,0,0.3);
}
.theme-settings::-webkit-scrollbar-thumb:window-inactive {
/*background: rgba(255,0,0,0.4); */
}

.theme-builder .actions > div {
Expand All @@ -186,6 +213,10 @@ body {
-webkit-box-sizing: border-box;
}

.theme-builder color-row {
padding-right: 5px;
}

.actions > div:hover {
background-color: var(--highlight-color);
}
Expand Down
1 change: 1 addition & 0 deletions index.html
Expand Up @@ -63,6 +63,7 @@ <h2>Theme Builder</h2>
<script type="text/javascript" src="js/components/prompt_add_card.comp.js"></script>
<script type="text/javascript" src="js/components/prompt_confirm.comp.js"></script>
<script type="text/javascript" src="js/components/color_row.comp.js"></script>
<script type="text/javascript" src="js/components/dialog_card_menu.comp.js"></script>
<script type="text/javascript" src="js/app.js"></script>
<!--endbuild-->
</body>
Expand Down

0 comments on commit cfb8efb

Please sign in to comment.