Skip to content

Commit

Permalink
Style correction. Scale based on HTML tag percentage root font-size.
Browse files Browse the repository at this point in the history
  • Loading branch information
Michel-Ange committed Aug 26, 2015
1 parent 1fa2a18 commit cdddbfb
Show file tree
Hide file tree
Showing 18 changed files with 50 additions and 62 deletions.
Expand Up @@ -98,7 +98,7 @@ div.filemanager-header {
top: -25px;
left: 0;
width: auto;
margin-left:105px;
margin-left:55px;
height: 25px;
padding: 3px 0;
background: transparent;
Expand Down Expand Up @@ -501,7 +501,7 @@ div.filemanager h1 {
height: 30px;
line-height: 30px;
color: #333;
font-size: 16px;
font-size: 1.4rem;
letter-spacing: 1px;
overflow: hidden;
white-space: nowrap;
Expand Down Expand Up @@ -607,7 +607,7 @@ div.filemanager input.filemanager-dir {
}
div.filemanager .filemanager-dir span {
float:left;
padding:0 2px;
padding:0;
color:#666;
}
div.filemanager span.filemanager-dir a.icon {
Expand Down
Expand Up @@ -24,7 +24,7 @@ div.accordion div h3.toggler {
margin: 0;
padding: 6px 10px;
background: #f1f1f1 url(../images/bg-panel-header.gif) repeat-x;
font-size: 12px;
font-size: 1.2rem;
cursor: pointer;
border-top: 1px solid #e3e3e3;
}
Expand Down
30 changes: 12 additions & 18 deletions themes/admin/javascript/mochaui/Themes/ionize/css/core.css
Expand Up @@ -50,27 +50,22 @@ table {
*/

/* Structure */
html {
font-size: 62.5%;
}
html.sizePlus1{font-size: 80%}
html.sizePlus2{font-size: 90%}
html.sizePlus3{font-size: 100%}

body {
text-align: left;
font-family: "lucida grande", tahoma, verdana, arial, sans-serif;
font-size: 11px;
font-size: 1.1rem;
line-height: 18px;
color: #3f3f3f;
overflow: hidden;
}

body.seizePlus1 {
font-size: 12px;
}

body.seizePlus2 {
font-size: 13px;
}

body.seizePlus3 {
font-size: 15px;
}

/* Typography */
h2, h3, h4 {
margin: 0 0 10px 0;
Expand All @@ -79,16 +74,16 @@ h2, h3, h4 {
}

h2 {
font-size: 0.825rem;
font-size: 2.4rem;
}

h3 {
font-size: 0.925rem;
font-size: 1.2rem;
color: #7c98a8;
}

h4 {
font-size: 0.8rem;
font-size: 1.1rem;
}

a {
Expand Down Expand Up @@ -133,7 +128,6 @@ dd {
input,
textarea {
font-family: inherit;
font-size: inherit;
}

/* Menus */
Expand All @@ -149,7 +143,7 @@ pre {
color: #060;
display: block;
font-family: 'Courier New', Courier, monospace;
font-size: 11px;
font-size: 1.1rem;
max-height: 250px;
overflow: auto;
margin: 0 0 10px 0;
Expand Down
12 changes: 6 additions & 6 deletions themes/admin/javascript/mochaui/Themes/ionize/css/desktop.css
Expand Up @@ -50,13 +50,13 @@
}

#about_contentWrapper p.version {
font-size: 0.9em;
font-size: 0.9rem;
margin-bottom: 5px;
color: #777;
}

#about_contentWrapper p {
font-size: 0.9em;
font-size: 0.9rem;
padding-bottom: 6px;
line-height: 15px;
}
Expand Down Expand Up @@ -91,7 +91,7 @@
display: none;
margin: 0;
padding: 0 5px 0 0;
font-size: 20px;
font-size: 2rem;
line-height: 25px;
font-weight: bold;
color: #fff;
Expand All @@ -100,7 +100,7 @@
.desktopTitlebar h2.tagline {
padding: 7px 0 0 0;
font-family: Verdana, Arial, Helvetica, sans-serif;
font-size: 10px;
font-size: 1rem;
color: #d4dce4;
font-weight: bold;
text-align: center;
Expand All @@ -114,7 +114,7 @@

.desktopTitlebar div.topNav {
font-family: "lucida grande", tahoma, verdana, arial, sans-serif;
font-size: 0.70rem;
font-size: 1.1rem;
position: absolute;
right: 0;
top: 0;
Expand Down Expand Up @@ -220,7 +220,7 @@ li.divider {
.panel-header h2 {
border: none;
display: inline-block;
font-size: 0.75rem;
font-size: 1.2rem;
margin: 0;
padding: 3px 8px 0 8px;
height: 22px;
Expand Down
2 changes: 1 addition & 1 deletion themes/admin/javascript/mochaui/Themes/ionize/css/grid.css
Expand Up @@ -16,7 +16,7 @@

.grid {
font-family: Verdana, Geneva, Arial, Helvetica, sans-serif;
font-size: 11px;
font-size: 1.1rem;
position: relative;
border: 0 solid #eee;
overflow: hidden; /* to exclude debug */
Expand Down
4 changes: 2 additions & 2 deletions themes/admin/javascript/mochaui/Themes/ionize/css/list.css
Expand Up @@ -80,14 +80,14 @@ div.list tr.head td {
line-height: 20px;
font-family: Sans-Serif;
font-weight: bold;
font-size: 9pt;
font-size: 0.9rem;
}

div.list tr.head td {
line-height: 18px;
color: #444444;
font-family: Sans-Serif;
font-size: 13px;
font-size: 1.3rem;
font-weight: bold;
}

Expand Down
2 changes: 1 addition & 1 deletion themes/admin/javascript/mochaui/Themes/ionize/css/menu.css
Expand Up @@ -25,7 +25,7 @@
padding: 0;
margin: 0;
list-style: none;
font-size: 0.75rem;
font-size: 1.2rem;
text-align: left;
}

Expand Down
6 changes: 3 additions & 3 deletions themes/admin/javascript/mochaui/Themes/ionize/css/pager.css
Expand Up @@ -37,7 +37,7 @@
position: relative;
top: 5px;
overflow: visible;
font-size: 10px;
font-size: 1rem;
color: #777777;
}

Expand Down Expand Up @@ -84,13 +84,13 @@

/* Form Elements */
.pager select {
font-size: 10px;
font-size: 1rem;
margin-top: 2px;
}

.pager input {
vertical-align: text-top;
position: relative;
top: -2px;
font-size: 10px;
font-size: 1rem;
}
Expand Up @@ -55,7 +55,7 @@ fieldset div.stepperDown {
width: 15px;
height: 10px;
text-align: center;
font-size: 11px;
font-size: 1.1rem;
line-height: 9px;
font-family: Courier, monospace;
color: white;
Expand Down
2 changes: 1 addition & 1 deletion themes/admin/javascript/mochaui/Themes/ionize/css/tab.css
Expand Up @@ -26,7 +26,7 @@ div.tabs ul {
list-style: none;
margin: 0;
line-height: 16px;
font-size: 11px;
font-size: 1.1rem;
}

div.tabs ul li {
Expand Down
Expand Up @@ -34,13 +34,10 @@
height: 30px; /* Used for IE 6.0 since it does not support min-height */
}

/*
.taskbarTab { float: left; position: relative; font-size: 11px; width: 150px; height: 24px; margin: 0 3px 2px 0; overflow: hidden; cursor: pointer; background: url(../images/taskbar-tabs.gif) left top no-repeat; }
*/
.taskbarTab {
float: left;
position: relative;
font-size: 11px;
font-size: 1.1rem;
width: 150px;
height: 24px;
margin: 0 3px 2px 0;
Expand Down
Expand Up @@ -100,7 +100,7 @@ div.panel-header div.tabs ul {

.toolbar span.icon {
line-height: 24px;
font-size: 14px;
font-size: 1.4rem;
padding: 0;
background-repeat: no-repeat;
background-position: center;
Expand Down
2 changes: 1 addition & 1 deletion themes/admin/javascript/mochaui/Themes/ionize/css/tree.css
Expand Up @@ -20,7 +20,7 @@
div.tree {
overflow: scroll;
overflow-x: auto;
font-size: 11px;
font-size: 1.1rem;
}

ul.tree,
Expand Down
5 changes: 3 additions & 2 deletions themes/admin/javascript/mochaui/Themes/ionize/css/window.css
Expand Up @@ -70,7 +70,7 @@

.mochaTitle {
float: left;
font-size: 12px;
font-size: 1.2rem;
font-family: Arial, Helvetica, sans-serif;
line-height: 23px;
vertical-align: middle;
Expand All @@ -82,6 +82,7 @@

.mochaTitle {
color: #181818;
line-height: 25px;
}

.mochaTitle.macintel {
Expand Down Expand Up @@ -567,7 +568,7 @@ div.mochaToolbarWrapper.bottom {
.mocha.alert .message,
.mocha.error .message {
padding: 20px 10px 0 70px;
font-size: 12px;
font-size: 1.2rem;
color: #000;
min-height: 80px;
}
2 changes: 1 addition & 1 deletion themes/admin/styles/original/css/content.css
Expand Up @@ -125,7 +125,7 @@ dfn{font-style: normal;color:#999;}
#splitPanel_sidePanel_pad p {
}
#splitPanel_sidePanel_pad .element-options-content {
margin: 0 0 15px 19px;
margin: 0 0 15px 10px;
}
#splitPanel_sidePanel_pad .info dl.small dt {
width:100px;
Expand Down
10 changes: 3 additions & 7 deletions themes/admin/styles/original/css/form.css
Expand Up @@ -21,7 +21,7 @@ input[type="file"] > input[type="button"]::-moz-focus-inner {
}

input, textarea, select {
font-size: 11px;
font-size: 1.1rem;
}

/* Form layout
Expand Down Expand Up @@ -191,8 +191,6 @@ label.toggler {
}
label[title]
{
background: url("../images/icon_12_label_help.png") no-repeat scroll right top transparent;
padding-right: 14px;
border-bottom: dotted 1px #94aec9;
}
table thead tr td label[title],
Expand Down Expand Up @@ -223,7 +221,6 @@ textarea{
.select {
border:1px solid #bbb;
padding:3px;
font-size: 0.85rem;
}
optgroup:before {
content: attr(label);
Expand All @@ -246,8 +243,7 @@ dl.small .select {
.inputtext {
border: 1px solid #bbb;
padding: 4px;
font-size: 0.75rem;

font-size: 1.1rem;
}
input[type="text"],
input[type="password"],
Expand Down Expand Up @@ -391,7 +387,7 @@ input.submit{
border:1px solid #fff;
color:#333;
cursor:pointer;
font-size: 0.8rem;
font-size: 1.1rem;
line-height: 20px;
vertical-align: middle;
}
Expand Down
4 changes: 2 additions & 2 deletions themes/admin/views/desktop/desktop.php
Expand Up @@ -3,7 +3,7 @@
$c = '?v='.$v;
?>
<!DOCTYPE html>
<html>
<html<?php $fontScale = (int) Settings::get('backend_font_scale'); if($fontScale > 0) { ?> class="sizePlus<?php echo $fontScale; ?>"<?php } ?>>
<head>
<meta charset='utf-8' />
<title><?php echo lang('ionize_administration') . ' | ' . (Settings::get('site_title') ? Settings::get('site_title') : ''); ?></title>
Expand Down Expand Up @@ -260,7 +260,7 @@
<?php endforeach; ?>

</head>
<body<?php $fontScale = (int) Settings::get('backend_font_scale'); if($fontScale > 0) { ?> class="seizePlus<?php echo $fontScale; ?>"<?php } ?>>
<body>

<div id="desktop" class="desktop"></div>

Expand Down

0 comments on commit cdddbfb

Please sign in to comment.