Skip to content

Commit

Permalink
v3.1.0
Browse files Browse the repository at this point in the history
  • Loading branch information
JannisX11 committed Aug 17, 2019
1 parent 32dab97 commit 2b3111c
Show file tree
Hide file tree
Showing 65 changed files with 4,923 additions and 3,959 deletions.
93 changes: 51 additions & 42 deletions css/dialogs.css
Original file line number Diff line number Diff line change
Expand Up @@ -76,28 +76,27 @@
margin-top: 16px;
margin: 16px 4px 0 4px;
}
.dialog .tab {
float: left;
width: 25%;
.tab_bar {
height: 30px;
text-align: center;
display: flex;
}
.tab_bar > * {
height: 100%;
padding-top: 2px;
background: var(--color-dark);
vertical-align: middle;
flex-grow: 1;
cursor: default;
text-align: center;
vertical-align: middle;
}
.dialog#settings .tab:firstChild {
margin-left: 0;
width: 25%;
.tab_bar > .open {
border-bottom: 3px solid var(--color-accent);
}
.dialog .tab:hover {
.tab_bar > *:hover {
color: var(--color-light);
}
.dialog .tab.open {
background: transparent;
border-top: none;
transition: border-top 200 ease-in;
}



.dialog .tab_content {
height: calc(100% - 90px);
width: 100%;
Expand Down Expand Up @@ -182,6 +181,9 @@
#settingslist li li {
padding: 5px 0;
}
#settingslist li li:hover {
color: var(--color-light);
}
#settingslist li > .setting_element {
width: 50px;
text-align: center;
Expand Down Expand Up @@ -269,10 +271,8 @@
vertical-align: top;
display: inline-block;
}
#keybindlist > li > div:focus {
color: transparent;
text-shadow: 0 0 0 var(--color-light);
background-color: var(--color-dark);
#keybindlist > li > ul > li {
position: relative;
}
#keybindlist {
max-height: 600px;
Expand Down Expand Up @@ -306,16 +306,9 @@
margin: 0;
font-size: 1.2em;
}
input.color_input {
-webkit-appearance: none;
display: none;
}
label.color_input {
-webkit-appearance: none;
appearance: none;
outline: none;
height: 36px;
width: 46px;
.layout_color_preview {
height: 32px;
width: 42px;
margin: 4px;
margin-top: 10px;
display: inline-block;
Expand Down Expand Up @@ -443,6 +436,8 @@
padding: 8px;
padding-top: 3px;
padding-bottom: 0;
min-width: 155px;
margin-right: 8px;
}

/*PE Import Dialog*/
Expand Down Expand Up @@ -509,15 +504,8 @@
.dialog#plugins {
width: 660px;
}
#plugins .tab {
border: none;
margin-left: 0px;
background: transparent;
}
#plugins .tab.open {
border: 1px solid var(--color-border);
background: var(--color-back);
border-bottom: none;
#plugins .tab_bar {
width: calc(100% - 300px);
}
#plugin_list {
max-height: 600px;
Expand All @@ -534,8 +522,11 @@
min-height: 128px;
height: auto;
}
#plugin_list li.testing {
border: 3px solid var(--color-accent);
/*#plugin_list li.testing .title {
border-bottom: 3px solid var(--color-accent);
}*/
#plugin_list li .icon_wrapper {
display: inline;
}
#plugin_list li > * {
margin: 0;
Expand Down Expand Up @@ -589,7 +580,7 @@
#plugin_list li .title:hover i.plugin_expand_icon {
display: inline-block;
}
#plugin_list li .title:hover i.plugin_icon {
#plugin_list li .title:hover .plugin_icon {
display: none;
}

Expand All @@ -600,7 +591,7 @@
}
#plugin_list .description {
font-size: 0.9em;
height: 48px;
max-height: 48px;
margin-right: 12px;
}
#plugin_list .about {
Expand Down Expand Up @@ -704,8 +695,26 @@
font-size: 0.94em
}
#action_selector ul > li {
height: 32px;
padding: 4px;
overflow: hidden;
display: flex;
white-space: nowrap;
}
#action_selector ul > li div.icon_wrapper {
flex-grow: 0;
flex-shrink: 0;
}
#action_selector ul > li div.name {
padding-left: 4px;
flex-grow: 1;
flex-shrink: 0;
}
#action_selector ul > li label {
font-size: 0.84em;
padding: 2px;
flex-grow: 0;
flex-shrink: 1;
}
#action_selector ul > li.selected {
background-color: var(--color-accent);
Expand Down
19 changes: 16 additions & 3 deletions css/general.css
Original file line number Diff line number Diff line change
Expand Up @@ -103,6 +103,15 @@
.bar > * {
float: left;
}
.bar.flex {
display: flex;
}
.bar.flex > * {
float: none;
}
.bar.flex > label {
flex-grow: 0;
}
.scroll_horizontal {
overflow-x: scroll;
overflow-y: hidden;
Expand Down Expand Up @@ -169,7 +178,7 @@
top: 40px;
left: 60px;
}
#selection_box {
.selection_rectangle {
position: absolute;
display: block;
border: 1px solid var(--color-accent);
Expand Down Expand Up @@ -197,6 +206,7 @@
li.menu_bar_point {
font-size: 17px;
padding: 0 10px;
padding-top: 2px;
display: inline-block;
height: 100%;
font-weight: normal;
Expand Down Expand Up @@ -351,7 +361,7 @@
}
.tooltip {
position: absolute;
height: 30px;
height: 28px;
padding-left: 5px;
padding-right: 5px;
padding-top: 2px;
Expand Down Expand Up @@ -390,7 +400,7 @@
}
.contextMenu li {
height: 32px;
padding: 4px;
padding: 5px;
padding-left: 34px;
padding-right: 8px;
}
Expand Down Expand Up @@ -478,6 +488,9 @@
padding: 24px;
max-height: 600px;
}
#start_screen section right {
overflow-y: auto;
}
#start_screen left {
flex-grow: 0;
background-size: cover;
Expand Down
Loading

0 comments on commit 2b3111c

Please sign in to comment.