Skip to content

Commit

Permalink
Merge branch 'new-theme'
Browse files Browse the repository at this point in the history
  • Loading branch information
@mrg2001
mrg2001 committed Jun 11, 2021
2 parents fdf3652 + 82e6650 commit 7765e56
Show file tree
Hide file tree
Showing 29 changed files with 1,282 additions and 1,005 deletions.
4 changes: 2 additions & 2 deletions demos/index.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,11 @@
<head>
<title>w2ui Demos</title>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
<link rel="stylesheet" type="text/css" media="screen" href="../dist/w2ui.min.css" id="mainCSS" />
<link rel="stylesheet" type="text/css" media="screen" href="../dist/w2ui.css" id="mainCSS" />
<link rel="stylesheet" type="text/css" media="screen" href="../libs/font-awesome/css/font-awesome.css" />
<link rel="stylesheet" type="text/css" media="screen" href="index.css"/>
<script type="text/javascript" src="../libs/jquery/jquery-3.5.1.js"></script>
<script type="text/javascript" src="../dist/w2ui.min.js"></script>
<script type="text/javascript" src="../dist/w2ui.js"></script>
<script type="text/javascript" src="code-mirror.js"></script>
<script type="text/javascript" src="index.js"></script>
</head>
Expand Down
3 changes: 2 additions & 1 deletion index.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,8 @@ <h2>Manual Test Helpers</h2>
<li><a href="test/sidebar.html">sidebar.html</a></li>
<li><a href="test/tabs.html">tabs.html</a></li>
<li><a href="test/tabs-edit-grid.html">tabs-edit-grid.html</a></li>
<li><a href="test/toolbar.html">toolbar.html</a></li>
<li><a href="test/toolbar1.html">toolbar1.html</a></li>
<li><a href="test/toolbar2.html">toolbar2.html</a></li>
</ul>
</ul>
</body>
Expand Down
2 changes: 1 addition & 1 deletion src/less/icons/svg/box.svg
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 1 addition & 1 deletion src/less/icons/w2ui-font.css
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Binary file modified src/less/icons/w2ui-font.woff
View file
Binary file not shown.
50 changes: 26 additions & 24 deletions src/less/src/buttons.less
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,16 +2,17 @@

@w2ui-btn-text-shadow: 0px 0px 1px #111;

input[type=button],
button.w2ui-btn {
position: relative;
display: inline-block;
border-radius: 4px;
margin: 0px 5px;
border-radius: 14px;
margin: 0px 3px;
padding: 6px 12px; // do not use !important
color: #666;
font-size: 12px; // do not use !important
border: 1px solid #B6B6B6;
.linear-gradient-vertical4(#FFF, 0%, #E7E7E7, 100%);
border: 1px solid transparent;
.linear-gradient-vertical4(#E8E8EE, 0%, #E8E8EE, 100%);
outline: none;
box-shadow: 0px 1px 0px white;
cursor: default;
Expand All @@ -22,13 +23,13 @@ button.w2ui-btn {

&:hover {
text-decoration: none;
border: 1px solid #bbb;
.linear-gradient-vertical4(#F7F7F7, 0%, #DDDDDD, 100%);
// border: 1px solid #bbb;
.linear-gradient-vertical4(#ddd, 0%, #DDDDDD, 100%);
color: #333;
}

&:active, &.clicked {
border: 1px solid #999;
// border: 1px solid #999;
.linear-gradient-vertical4(#ccc, 0%, #ccc, 100%);
text-shadow: 1px 1px 1px #eee;
}
Expand All @@ -43,7 +44,7 @@ button.w2ui-btn {
&:focus:before {
content: "";
border: 1px dashed #aaa;
border-radius: 3px;
border-radius: 15px;
position: absolute;
top: 2px;
bottom: 2px;
Expand All @@ -61,14 +62,14 @@ button.w2ui-btn {

button.w2ui-btn-blue {
color: white;
.linear-gradient-vertical4(#80C0F7, 0%, #269DF0, 100%);
border: 1px solid #538AB7;
.linear-gradient-vertical4(#269DF0, 0%, #269DF0, 100%);
border: 1px solid #269DF0;
text-shadow: @w2ui-btn-text-shadow;

&:hover {
color: white;
.linear-gradient-vertical4(#73B6F0, 0%, #2391DD, 100%);
border: 1px solid #497BA3;
.linear-gradient-vertical4(#2391DD, 0%, #2391DD, 100%);
border: 1px solid #2391DD;
text-shadow: @w2ui-btn-text-shadow;
}

Expand All @@ -88,14 +89,14 @@ button.w2ui-btn-blue {

button.w2ui-btn-green {
color: white;
.linear-gradient-vertical4(#81CF81, 0%, #52A452, 100%);
border: 1px solid #479247;
.linear-gradient-vertical4(#52A452, 0%, #52A452, 100%);
border: 1px solid #52A452;
text-shadow: @w2ui-btn-text-shadow;

&:hover {
color: white;
.linear-gradient-vertical4(#6ABE68, 0%, #3F8F3D, 100%);
border: 1px solid #479247;
.linear-gradient-vertical4(#3F8F3D, 0%, #3F8F3D, 100%);
border: 1px solid #3F8F3D;
text-shadow: @w2ui-btn-text-shadow;
}

Expand All @@ -115,14 +116,14 @@ button.w2ui-btn-green {

button.w2ui-btn-orange {
color: white;
.linear-gradient-vertical4(#FCC272, 0%, #FB8822, 100%);
border: 1px solid #B68B4C;
.linear-gradient-vertical4(#FB8822, 0%, #FB8822, 100%);
border: 1px solid #FB8822;
text-shadow: @w2ui-btn-text-shadow;

&:hover {
color: white;
.linear-gradient-vertical4(#F4AD59, 0%, #F1731F, 100%);
border: 1px solid #B68B4C;
.linear-gradient-vertical4(#F1731F, 0%, #F1731F, 100%);
border: 1px solid #F1731F;
text-shadow: @w2ui-btn-text-shadow;
}

Expand All @@ -142,14 +143,14 @@ button.w2ui-btn-orange {

button.w2ui-btn-red {
color: white;
.linear-gradient-vertical4(#FF6E70, 0%, #C72D2D, 100%);
border: 1px solid #BB3C3E;
.linear-gradient-vertical4(#f9585a, 0%, #f9585a, 100%);
border: 1px solid #f9585a;
text-shadow: @w2ui-btn-text-shadow;

&:hover {
color: white;
.linear-gradient-vertical4(#EE696C, 0%, #AE2527, 100%);
border: 1px solid #BB3C3E;
.linear-gradient-vertical4(#de4446, 0%, #de4446, 100%);
border: 1px solid #de4446;
text-shadow: @w2ui-btn-text-shadow;
}

Expand All @@ -169,6 +170,7 @@ button.w2ui-btn-red {

button.w2ui-btn-small {
padding: 5px !important;
border-radius: 4px;
margin: 0px;
min-width: 0px;

Expand Down
67 changes: 35 additions & 32 deletions src/less/src/common.less
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
.w2ui-reset {
.box-sizing;
font-family: @main-font-family;
font-size: 11px;
font-size: 12px;
* {
color: default;
line-height: 100%;
Expand All @@ -25,22 +25,27 @@
}
table tr th, table tr td {
font-family: @main-font-family;
font-size: 11px;
font-size: 12px;
}
input:not([type=button]):not([type=submit]):not([type=checkbox]):not([type=radio]),
select, textarea {
display: inline-block;
width: auto;
height: auto;
vertical-align: baseline;
padding: 4px;
padding: 6px;
margin: 0;
font-size: 11px;
font-size: 12px;
background-color: @input-background-color;
border: @input-border;
&:focus {
background-color: white;
}
}
select {
padding: 1px;
height: 23px;
font-size: 11px;
padding: 5px;
height: 26px;
font-size: 12px;
}
}

Expand All @@ -56,7 +61,8 @@
text-align: center;
}

.w2ui-disabled, .w2ui-readonly {
.w2ui-disabled,
.w2ui-readonly {
background-color: #f1f1f1 !important;
color: #777 !important;
outline: none!important;
Expand All @@ -82,7 +88,7 @@
right: 0px;
overflow: auto;
line-height: 1.5;
font-size: 14px;
font-size: 15px;
& .w2ui-centered {
line-height: 1.5
}
Expand All @@ -94,7 +100,8 @@
bottom: 0px;
left: 0px;
right: 0px;
border-top: 1px solid #e5e5e5;
border-top: 1px solid #efefef;
background-color: white;
text-align: center;
padding: 8px;
}
Expand Down Expand Up @@ -122,16 +129,17 @@ div.w2ui-input:focus {
outline-color: @input-focus-outline-color;
}

input:not([type=button]):not([type=submit]).w2ui-input,
input:not([type=button]):not([type=submit]),
textarea.w2ui-input {
padding: 4px;
padding: 6px;
border: @input-border;
border-radius: 3px;
color: @input-color;
background-color: @input-background-color;
line-height: normal;
&:focus {
outline-color: @input-focus-outline-color;
background-color: white;
}
&:disabled, &[readonly] {
background-color: #f1f1f1;
Expand All @@ -153,13 +161,13 @@ input.w2ui-input:-ms-input-placeholder {

select.w2ui-input {
color: @input-color;
padding: 0px 15px 0px 7px;
padding: 0px 20px 0px 7px;
line-height: 1.8;
border-radius: 3px;
border: @input-border;
-webkit-appearance: none;
background-image: url('data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACgAAAALCAQAAACnzwd+AAAAcklEQVR4AcXMsQFBQQDG4P9tAgC0gJYRQJZgKQMwCqCku6vVAAAA+NJHP4KHOk0aV2pRw61n4BBmyOxKQ8I4ehZeuhd3HTx6DQEGZ7sBfr2OOOOj3Yi43kMKs9sZknofOexqZ8npMygwWZTX51CipP+YA1OiZJbYYg9lAAAAAElFTkSuQmCC'),
linear-gradient(to bottom,#FFF 20%,#f6f6f6 50%,#EEE 52%,#f4f4f4 100%);
linear-gradient(to bottom, #f8f8f8 20%, #f8f8f8 50%, #f8f8f8 52%, #f8f8f8 100%);
background-size: 17px 6px, 100% 100%;
background-position: right center, left top;
background-repeat: no-repeat, no-repeat;
Expand Down Expand Up @@ -308,11 +316,11 @@ input[type="checkbox"].w2ui-toggle {
background-color: @overlay-background-color;
border-color: @overlay-background-color;
box-shadow: @overlay-shadow;
border-radius: 4px;
border-radius: 6px;
text-align: left;

& > div {
border-radius: 4px;
border-radius: 6px;
position: relative;
border: @overlay-border-width solid @overlay-border-color;
}
Expand All @@ -332,17 +340,17 @@ input[type="checkbox"].w2ui-toggle {
position: absolute;
border-color: inherit;
bottom: 100%;
left:@overlay-border-width + 1;
left: @overlay-border-width + 1;
}

&.top-arrow {

&:before {
border-bottom: 12px solid darken(@overlay-border-color, 3%);
border-bottom: 10px solid darken(@overlay-border-color, 3%);
border-right: 12px solid transparent;
border-left: 12px solid transparent;
bottom: 100%;
margin-bottom: -@overlay-border-width;
margin-bottom: -@overlay-border-width + 1;
}

&:after {
Expand All @@ -358,7 +366,7 @@ input[type="checkbox"].w2ui-toggle {
&.bottom-arrow {

&:before {
border-top: 12px solid darken(@overlay-border-color, 3%);
border-top: 10px solid darken(@overlay-border-color, 3%);
border-right: 12px solid transparent;
border-left: 12px solid transparent;
top: 100%;
Expand Down Expand Up @@ -406,8 +414,8 @@ input[type="checkbox"].w2ui-toggle {
margin-top: 0px;
background-color: @bubble-tag-background-color;
color: @bubble-tag-color !important;
font-size: 11px;
font-family: verdana;
font-size: 12px;
font-family: @main-font-family;
text-shadow: 1px 1px 3px #000; // for sharper text in a bubble
line-height: 1.4;
letter-spacing: 0.1px;
Expand Down Expand Up @@ -495,9 +503,10 @@ input[type="checkbox"].w2ui-toggle {
position: absolute;
top: 0px;
bottom: 0px;
border-radius: 5px;
table {
font-family: verdana;
font-size: 11px;
font-family: @main-font-family;
font-size: 12px;
width: 100%;
color: @drop-menu-color;
background-color: @drop-menu-background-color;
Expand Down Expand Up @@ -527,8 +536,8 @@ input[type="checkbox"].w2ui-toggle {
background-color: @dropdown-item-even-background-color;
&.w2ui-disabled, &.w2ui-disabled .w2ui-icon {
opacity: 1;
color: #c5c5c5 !important;
background-color: @dropdown-item-even-background-color !important;
color: silver !important;
}
}

Expand All @@ -537,8 +546,8 @@ input[type="checkbox"].w2ui-toggle {
background-color: @dropdown-item-odd-background-color;
&.w2ui-disabled, &.w2ui-disabled .w2ui-icon {
opacity: 1;
color: #c5c5c5 !important;
background-color: @dropdown-item-odd-background-color !important;
color: silver !important;
}
}

Expand Down Expand Up @@ -724,12 +733,6 @@ input[type="checkbox"].w2ui-toggle {
margin: 2px 2px;
display: inline-block;

&.icon-search, &.icon-search-down {
.background-image(@image-search, no-repeat, center, ~"!important");
background-size: 14px 12px !important;
opacity: 0.9;
}

&.icon-folder {
.background-image(@image-folder, no-repeat, center, ~"!important");
}
Expand Down
Loading

0 comments on commit 7765e56

Please sign in to comment.