mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #5102 from owncloud/input-simplify 

Input simplify
This commit is contained in:
Morris Jobke 2013-10-04 10:40:32 -07:00
parent bae121b16d 0c53269b5e
commit a927c145be
5 changed files with 75 additions and 70 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
apps/files/css/files.css
View File

@ -7,13 +7,14 @@
.actions input, .actions button, .actions .button { margin:0; float:left; } .actions input, .actions button, .actions .button { margin:0; float:left; }
.actions .button a { color: #555; } .actions .button a { color: #555; }
.actions .button a:hover, .actions .button a:active { color: #333; } .actions .button a:hover, .actions .button a:active { color: #333; }
#new, #trash { #new, #trash {
z-index: 1010; z-index: 1010;
float: left; float: left;
padding: 0 !important; /* override default control bar button padding */ padding: 0 !important; /* override default control bar button padding */
} }
#trash { #trash {
margin: 0 1em; margin-right: 12px;
float: right; float: right;
} }
#new>a, #trash>a { #new>a, #trash>a {
@ -113,7 +114,7 @@ table th#headerDate, table td.date {
table.multiselect thead { table.multiselect thead {
position: fixed; position: fixed;
top: 89px; top: 89px;
z-index: 1; z-index: 10;
-moz-box-sizing: border-box; -moz-box-sizing: border-box;
box-sizing: border-box; box-sizing: border-box;
left: 0; left: 0;
@ -122,7 +123,7 @@ table.multiselect thead {
} }
table.multiselect thead th { table.multiselect thead th {
background-color: rgba(210,210,210,.7); background-color: rgba(220,220,220,.8);
color: #000; color: #000;
font-weight: bold; font-weight: bold;
border-bottom: 0; border-bottom: 0;

4
apps/files_sharing/css/public.css
View File

@ -3,8 +3,7 @@ body {
} }
#header { #header {
background:#1d2d44; background: #1d2d44 url('%webroot%/core/img/noise.png') repeat;
box-shadow:0 0 10px rgba(0,0,0,.5), inset 0 -2px 10px #222;
height:2.5em; height:2.5em;
left:0; left:0;
line-height:2.5em; line-height:2.5em;
@ -61,7 +60,6 @@ body {
p.info { p.info {
color:#777; color:#777;
text-align:center; text-align:center;
text-shadow:#fff 0 1px 0;
width:22em; width:22em;
margin:2em auto; margin:2em auto;
} }

4
core/css/apps.css
View File

@ -27,13 +27,11 @@
position: relative; position: relative;
width: 100%; width: 100%;
-moz-box-sizing: border-box; box-sizing: border-box; -moz-box-sizing: border-box; box-sizing: border-box;
text-shadow: 0 1px 0 rgba(255,255,255,.9);
} }
#app-navigation .active, #app-navigation .active,
#app-navigation .active a, #app-navigation .active a,
#app-navigation li:hover > a { #app-navigation li:hover > a {
background-color: #ddd; background-color: #ddd;
text-shadow: 0 1px 0 rgba(255,255,255,.7);
} }
/* special rules for first-level entries and folders */ /* special rules for first-level entries and folders */
@ -119,7 +117,7 @@
} }
#app-navigation > ul .open:hover { #app-navigation > ul .open:hover {
-moz-box-shadow: inset 0 0 3px #ccc; -webkit-box-shadow: inset 0 0 3px #ccc; box-shadow: inset 0 0 3px #ccc; box-shadow: inset 0 0 3px #ccc;
} }
#app-navigation > ul .open ul { #app-navigation > ul .open ul {

118
core/css/styles.css
View File

@ -38,7 +38,6 @@ body { background:#fefefe; font:normal .8em/1.6em "Helvetica Neue",Helvetica,Ari
.header-right > * { vertical-align:middle; } .header-right > * { vertical-align:middle; }
#header .avatardiv { #header .avatardiv {
text-shadow: none;
float: left; float: left;
display: inline-block; display: inline-block;
} }
@ -55,8 +54,7 @@ button, .button,
width:10em; margin:.3em; padding:.6em .5em .4em; width:10em; margin:.3em; padding:.6em .5em .4em;
font-size:1em; font-size:1em;
background:#fff; color:#333; border:1px solid #ddd; outline:none; background:#fff; color:#333; border:1px solid #ddd; outline:none;
-moz-box-shadow:0 1px 1px #fff, 0 2px 0 #bbb inset; -webkit-box-shadow:0 1px 1px #fff, 0 1px 0 #bbb inset; box-shadow:0 1px 1px #fff, 0 1px 0 #bbb inset; border-radius: 3px;
-moz-border-radius:.5em; -webkit-border-radius:.5em; border-radius:.5em;
} }
input[type="hidden"] { height:0; width:0; } input[type="hidden"] { height:0; width:0; }
input[type="text"], input[type="password"], input[type="search"], input[type="number"], input[type="email"], input[type="url"], textarea { input[type="text"], input[type="password"], input[type="search"], input[type="number"], input[type="email"], input[type="url"], textarea {
@ -92,10 +90,14 @@ input[type="checkbox"]:hover+label, input[type="checkbox"]:focus+label { color:#
input[type="submit"], input[type="button"], input[type="submit"], input[type="button"],
button, .button, button, .button,
#quota, select, .pager li a { #quota, select, .pager li a {
width:auto; padding:.4em; width: auto;
background-color:rgba(240,240,240,.9); font-weight:bold; color:#555; text-shadow:rgba(255,255,255,.9) 0 1px 0; border:1px solid rgba(190,190,190,.9); cursor:pointer; padding: .4em;
-moz-box-shadow:0 1px 1px rgba(255,255,255,.9), 0 1px 1px rgba(255,255,255,.9) inset; -webkit-box-shadow:0 1px 1px rgba(255,255,255,.9), 0 1px 1px rgba(255,255,255,.9) inset; box-shadow:0 1px 1px rgba(255,255,255,.9), 0 1px 1px rgba(255,255,255,.9) inset; background-color: rgba(240,240,240,.9);
-moz-border-radius:.5em; -webkit-border-radius:.5em; border-radius:.5em; font-weight: bold;
color: #555;
border: 1px solid rgba(190,190,190,.9);
cursor: pointer;
border-radius: 3px;
} }
input[type="submit"]:hover, input[type="submit"]:focus, input[type="submit"]:hover, input[type="submit"]:focus,
input[type="button"]:hover, input[type="button"]:focus, input[type="button"]:hover, input[type="button"]:focus,
@ -106,7 +108,10 @@ select:hover, select:focus, select:active {
color:#333; color:#333;
} }
input[type="submit"] img, input[type="button"] img, button img, .button img { cursor:pointer; } input[type="submit"] img, input[type="button"] img, button img, .button img { cursor:pointer; }
#header .button { border:none; -moz-box-shadow:none; -webkit-box-shadow:none; box-shadow:none; } #header .button {
border: none;
box-shadow: none;
}
/* disabled input fields and buttons */ /* disabled input fields and buttons */
input:disabled, input:disabled:hover, input:disabled:focus, input:disabled, input:disabled:hover, input:disabled:focus,
@ -123,34 +128,34 @@ a.disabled, a.disabled:hover, a.disabled:focus {
border: 1px solid #1d2d44; border: 1px solid #1d2d44;
background: #35537a; background: #35537a;
color: #ddd; color: #ddd;
text-shadow: #000 0 -1px 0;
-moz-box-shadow: 0 0 1px #000, 0 1px 0 #6d7d94 inset;
-webkit-box-shadow: 0 0 1px #000, 0 1px 0 #6d7d94 inset;
box-shadow: 0 0 1px #000, 0 1px 0 #6d7d94 inset;
} }
.primary:hover, input[type="submit"].primary:hover, input[type="button"].primary:hover, button.primary:hover, .button.primary:hover, .primary:hover, input[type="submit"].primary:hover, input[type="button"].primary:hover, button.primary:hover, .button.primary:hover,
.primary:focus, input[type="submit"].primary:focus, input[type="button"].primary:focus, button.primary:focus, .button.primary:focus { .primary:focus, input[type="submit"].primary:focus, input[type="button"].primary:focus, button.primary:focus, .button.primary:focus {
border: 1px solid #1d2d44; border: 1px solid #1d2d44;
background: #304d76; background: #304d76;
color: #fff; color: #fff;
text-shadow: #000 0 -1px 0;
-moz-box-shadow: 0 0 1px #000, 0 1px 0 #4d5d74 inset;
-webkit-box-shadow: 0 0 1px #000, 0 1px 0 #4d5d74 inset;
box-shadow: 0 0 1px #000, 0 1px 0 #4d5d74 inset;
} }
.primary:active, input[type="submit"].primary:active, input[type="button"].primary:active, button.primary:active, .button.primary:active { .primary:active, input[type="submit"].primary:active, input[type="button"].primary:active, button.primary:active, .button.primary:active {
border: 1px solid #1d2d44; border: 1px solid #1d2d44;
background: #1d2d44; background: #1d2d44;
color: #bbb; color: #bbb;
text-shadow: #000 0 -1px 0;
-moz-box-shadow: 0 1px 1px #3d4d64, 0 1px 1px 0 rgba(0,0,0,.2) inset;
-webkit-box-shadow: 0 1px 1px #3d4d64, 0 1px 1px 0 rgba(0,0,0,.2) inset;
box-shadow: 0 1px 1px #3d4d64, 0 1px 1px 0 rgba(0,0,0,.2) inset;
} }
.searchbox input[type="search"] { font-size:1.2em; padding:.2em .5em .2em 1.5em; background:#fff url('../img/actions/search.svg') no-repeat .5em center; border:0; -moz-border-radius:1em; -webkit-border-radius:1em; border-radius:1em; -ms-filter:"progid:DXImageTransform.Microsoft.Alpha(Opacity=70)"; filter:alpha(opacity=70);opacity:.7; -webkit-transition:opacity 300ms; -moz-transition:opacity 300ms; -o-transition:opacity 300ms; transition:opacity 300ms; margin-top:10px; float:right; } .searchbox input[type="search"] {
input[type="submit"].enabled { background:#66f866; border:1px solid #5e5; -moz-box-shadow:0 1px 1px #f8f8f8, 0 1px 1px #cfc inset; -webkit-box-shadow:0 1px 1px #f8f8f8, 0 1px 1px #cfc inset; box-shadow:0 1px 1px #f8f8f8, 0 1px 1px #cfc inset; } font-size: 1.2em;
padding: .2em .5em .2em 1.5em;
background: #fff url('../img/actions/search.svg') no-repeat .5em center;
border: 0;
border-radius: 1em;
-ms-filter: "progid:DXImageTransform.Microsoft.Alpha(Opacity=70)"; filter:alpha(opacity=70); opacity: .7;
margin-top: 10px;
float: right;
}
input[type="submit"].enabled {
background: #66f866;
border: 1px solid #5e5;
}
@ -204,8 +209,9 @@ input[type="submit"].enabled { background:#66f866; border:1px solid #5e5; -moz-b
#rightcontent, .rightcontent { position:fixed; top:6.4em; left:24.5em; overflow:auto } #rightcontent, .rightcontent { position:fixed; top:6.4em; left:24.5em; overflow:auto }
#emptycontent { #emptycontent {
font-size:1.5em; font-weight:bold; font-size: 1.5em;
color:#888; text-shadow:#fff 0 1px 0; font-weight: bold;
color: #888;
position: absolute; position: absolute;
text-align: center; text-align: center;
top: 50%; top: 50%;
@ -231,11 +237,9 @@ input[type="submit"].enabled { background:#66f866; border:1px solid #5e5; -moz-b
#body-login form input[type="checkbox"]+label { #body-login form input[type="checkbox"]+label {
text-align: center; text-align: center;
color: #ccc; color: #ccc;
text-shadow: 0 1px 0 rgba(255,255,255,.1);
-ms-filter: "progid:DXImageTransform.Microsoft.Alpha(Opacity=60)"; -ms-filter: "progid:DXImageTransform.Microsoft.Alpha(Opacity=60)";
filter: alpha(opacity=60); filter: alpha(opacity=60);
opacity: .6; opacity: .6;
text-shadow: 0 -1px 0 rgba(0,0,0,.5);
} }
#body-login div.buttons { text-align:center; } #body-login div.buttons { text-align:center; }
@ -289,9 +293,10 @@ input[name="adminpass-clone"] { padding-left:1.8em; width:11.7em !important; }
#body-login input[type="password"], #body-login input[type="password"],
#body-login input[type="email"] { #body-login input[type="email"] {
border: 1px solid #323233; border: 1px solid #323233;
-moz-box-shadow: 0 1px 0 rgba(255,255,255,.15), 0 1px 1px rgba(0,0,0,.25) inset; border-radius: 5px;
-webkit-box-shadow: 0 1px 0 rgba(255,255,255,.15), 0 1px 1px rgba(0,0,0,.25) inset; }
box-shadow: 0 1px 0 rgba(255,255,255,.15), 0 1px 1px rgba(0,0,0,.25) inset; #body-login input[type='submit'] {
border-radius: 5px;
} }
/* Nicely grouping input field sets */ /* Nicely grouping input field sets */
@ -307,18 +312,14 @@ input[name="adminpass-clone"] { padding-left:1.8em; width:11.7em !important; }
border-top: 0; border-top: 0;
border-bottom: 0; border-bottom: 0;
border-radius: 0; border-radius: 0;
-moz-box-shadow: 0 1px 0 rgba(255,255,255,.1), 0 1px 0 rgba(0,0,0,.1) inset !important; box-shadow: 0 1px 0 rgba(0,0,0,.1) inset !important;
-webkit-box-shadow: 0 1px 0 rgba(255,255,255,.1), 0 1px 0 rgba(0,0,0,.1) inset !important;
box-shadow: 0 1px 0 rgba(255,255,255,.1), 0 1px 0 rgba(0,0,0,.1) inset !important;
} }
#body-login .groupbottom input { #body-login .groupbottom input {
margin-top: 0; margin-top: 0;
border-top: 0; border-top: 0;
border-top-right-radius: 0; border-top-right-radius: 0;
border-top-left-radius: 0; border-top-left-radius: 0;
-moz-box-shadow: 0 1px 0 rgba(255,255,255,.1), 0 1px 0 rgba(0,0,0,.1) inset !important; box-shadow: 0 1px 0 rgba(0,0,0,.1) inset !important;
-webkit-box-shadow: 0 1px 0 rgba(255,255,255,.1), 0 1px 0 rgba(0,0,0,.1) inset !important;
box-shadow: 0 1px 0 rgba(255,255,255,.1), 0 1px 0 rgba(0,0,0,.1) inset !important;
} }
/* In field labels. No, HTML placeholder does not work as well. */ /* In field labels. No, HTML placeholder does not work as well. */
@ -416,8 +417,7 @@ label.infield { cursor:text !important; top:1.05em; left:.85em; }
#body-login form #selectDbType label { #body-login form #selectDbType label {
position:static; margin:0 -3px 5px; padding:.4em; position:static; margin:0 -3px 5px; padding:.4em;
font-size:12px; font-weight:bold; background:#f8f8f8; color:#888; cursor:pointer; font-size:12px; font-weight:bold; background:#f8f8f8; color:#888; cursor:pointer;
border:1px solid #ddd; text-shadow:#eee 0 1px 0; border: 1px solid #ddd;
-moz-box-shadow:0 1px 1px #fff, 0 1px 1px #fff inset; -webkit-box-shadow:0 1px 1px #fff, 0 1px 1px #fff inset;
} }
#body-login form #selectDbType label.ui-state-hover, #body-login form #selectDbType label.ui-state-active { color:#000; background-color:#e8e8e8; } #body-login form #selectDbType label.ui-state-hover, #body-login form #selectDbType label.ui-state-active { color:#000; background-color:#e8e8e8; }
@ -426,29 +426,24 @@ label.infield { cursor:text !important; top:1.05em; left:.85em; }
#body-login .warning, #body-login .update, #body-login .error { #body-login .warning, #body-login .update, #body-login .error {
display: block; display: block;
padding: 10px; padding: 10px;
color: #dd3b3b; color: #d2322d;
text-shadow: 0 -1px 0 rgba(0,0,0,.3);
background-color: rgba(0,0,0,.3); background-color: rgba(0,0,0,.3);
text-align: center; text-align: center;
-moz-border-radius: 5px; border-radius: 3px;
-webkit-border-radius: 5px;
border-radius: 5px;
cursor: default; cursor: default;
} }
#body-user .warning, #body-settings .warning { #body-user .warning, #body-settings .warning {
margin-top: 8px; margin-top: 8px;
padding: 5px; padding: 5px;
background: #fdd; background: #fdd;
-webkit-border-radius: 3px; border-radius: 3px;
-moz-border-radius: 3px;
border-radius: 3px;
} }
.warning legend, .warning legend,
.warning a, .warning a,
.error a { .error a {
color: #dd3b3b !important; color: #d2322d !important;
font-weight: bold; font-weight: bold;
} }
.error pre { .error pre {
@ -471,7 +466,6 @@ label.infield { cursor:text !important; top:1.05em; left:.85em; }
font-weight: bold; font-weight: bold;
} }
#body-login .warning legend { #body-login .warning legend {
text-shadow: none;
-ms-filter: "progid:DXImageTransform.Microsoft.Alpha(Opacity=100)"; -ms-filter: "progid:DXImageTransform.Microsoft.Alpha(Opacity=100)";
filter: alpha(opacity=100); filter: alpha(opacity=100);
opacity: 1; opacity: 1;
@ -543,7 +537,6 @@ label.infield { cursor:text !important; top:1.05em; left:.85em; }
font-size: 11px; font-size: 11px;
text-align: center; text-align: center;
color: #fff; color: #fff;
text-shadow: #000 0 -1px 0;
white-space:nowrap; overflow:hidden; text-overflow:ellipsis; /* ellipsize long app names */ white-space:nowrap; overflow:hidden; text-overflow:ellipsis; /* ellipsize long app names */
padding-bottom: 10px; padding-bottom: 10px;
} }
@ -607,7 +600,6 @@ label.infield { cursor:text !important; top:1.05em; left:.85em; }
margin-top: 7px; margin-top: 7px;
margin-left: 10px; margin-left: 10px;
color: #bbb; color: #bbb;
text-shadow: 0 -1px 0 #000;
} }
#expand { #expand {
padding: 15px 15px 15px 5px; padding: 15px 15px 15px 5px;
@ -621,7 +613,7 @@ label.infield { cursor:text !important; top:1.05em; left:.85em; }
position:absolute; right:0; top:45px; z-index:76; display:none; position:absolute; right:0; top:45px; z-index:76; display:none;
background:#383c43 url('../img/noise.png') repeat; background:#383c43 url('../img/noise.png') repeat;
border-bottom-left-radius:7px; border-bottom:1px #333 solid; border-left:1px #333 solid; border-bottom-left-radius:7px; border-bottom:1px #333 solid; border-left:1px #333 solid;
-moz-box-shadow:0 0 7px rgb(29,45,68); -webkit-box-shadow:0 0 7px rgb(29,45,68); box-shadow:0 0 7px rgb(29,45,68); box-shadow:0 0 7px rgb(29,45,68);
-moz-box-sizing: border-box; box-sizing: border-box; -moz-box-sizing: border-box; box-sizing: border-box;
/* prevent ugly selection effect on accidental selection */ /* prevent ugly selection effect on accidental selection */
-webkit-user-select: none; -moz-user-select: none; -ms-user-select: none; user-select: none; -webkit-user-select: none; -moz-user-select: none; -ms-user-select: none; user-select: none;
@ -630,7 +622,6 @@ label.infield { cursor:text !important; top:1.05em; left:.85em; }
display: block; display: block;
height: 40px; height: 40px;
color: #fff; color: #fff;
text-shadow: 0 -1px 0 #000;
padding: 4px 12px 0; padding: 4px 12px 0;
-ms-filter: "progid:DXImageTransform.Microsoft.Alpha(Opacity=70)"; -ms-filter: "progid:DXImageTransform.Microsoft.Alpha(Opacity=70)";
filter: alpha(opacity=70); filter: alpha(opacity=70);
@ -656,7 +647,17 @@ label.infield { cursor:text !important; top:1.05em; left:.85em; }
.inlineblock { display: inline-block; } .inlineblock { display: inline-block; }
#notification-container { position: fixed; top: 0px; width: 100%; text-align: center; z-index: 101; line-height: 1.2;} #notification-container { position: fixed; top: 0px; width: 100%; text-align: center; z-index: 101; line-height: 1.2;}
#notification, #update-notification { z-index:101; background-color:#fc4; border:0; padding:0 .7em .3em; display:none; position: relative; top:0; -moz-border-radius-bottomleft:1em; -webkit-border-bottom-left-radius:1em; border-bottom-left-radius:1em; -moz-border-radius-bottomright:1em; -webkit-border-bottom-right-radius:1em; border-bottom-right-radius:1em; } #notification, #update-notification {
z-index: 101;
background-color: #fc4;
border: 0;
padding: 0 .7em .3em;
display: none;
position: relative;
top: 0;
border-bottom-left-radius: 3px;
border-bottom-right-radius: 3px;
}
#notification span, #update-notification span { cursor:pointer; font-weight:bold; margin-left:1em; } #notification span, #update-notification span { cursor:pointer; font-weight:bold; margin-left:1em; }
tr .action:not(.permanent), .selectedActions a { -ms-filter:"progid:DXImageTransform.Microsoft.Alpha(Opacity=0)"; filter:alpha(opacity=0); opacity:0; } tr .action:not(.permanent), .selectedActions a { -ms-filter:"progid:DXImageTransform.Microsoft.Alpha(Opacity=0)"; filter:alpha(opacity=0); opacity:0; }
@ -671,8 +672,7 @@ tbody tr:hover, tr:active { background-color:#f8f8f8; }
margin: 1em; margin: 1em;
background-color: rgb(240,240,240); background-color: rgb(240,240,240);
color: #555; color: #555;
text-shadow: #fff 0 1px 0; border-radius: 3px;
-moz-border-radius: .5em; -webkit-border-radius: .5em; border-radius: .5em;
} }
#body-settings .personalblock#quota { position:relative; padding:0; } #body-settings .personalblock#quota { position:relative; padding:0; }
#body-settings #controls+.helpblock { position:relative; margin-top:3em; } #body-settings #controls+.helpblock { position:relative; margin-top:3em; }
@ -685,8 +685,8 @@ code { font-family:"Lucida Console", "Lucida Sans Typewriter", "DejaVu Sans Mono
background-color: rgb(220,220,220); background-color: rgb(220,220,220);
font-weight: normal; font-weight: normal;
white-space: nowrap; white-space: nowrap;
-moz-border-radius-bottomleft: .4em; -webkit-border-bottom-left-radius: .4em; border-bottom-left-radius:.4em; border-bottom-left-radius: 3px;
-moz-border-radius-topleft: .4em; -webkit-border-top-left-radius: .4em; border-top-left-radius: .4em; } border-top-left-radius: 3px; }
#quotatext {padding:.6em 1em;} #quotatext {padding:.6em 1em;}
.pager { list-style:none; float:right; display:inline; margin:.7em 13em 0 0; } .pager { list-style:none; float:right; display:inline; margin:.7em 13em 0 0; }

12
settings/css/settings.css
View File

@ -25,8 +25,16 @@ input#identity { width:20em; }
width: 350px; width: 350px;
} }
.msg.success{ color:#fff; background-color:#0f0; padding:3px; text-shadow:1px 1px #000; } .msg.success {
.msg.error{ color:#fff; background-color:#f00; padding:3px; text-shadow:1px 1px #000; } color: #fff;
background-color: #47a447;
padding: 3px;
}
.msg.error {
color: #fff;
background-color: #d2322d;
padding: 3px;
}
table.nostyle label { margin-right: 2em; } table.nostyle label { margin-right: 2em; }
table.nostyle td { padding: 0.2em 0; } table.nostyle td { padding: 0.2em 0; }