From b039bb3a6737f37ecc0b391e92c125049b63cb19 Mon Sep 17 00:00:00 2001
From: Jared Hancock <jared@osticket.com>
Date: Tue, 23 Jul 2013 21:52:48 +0000
Subject: [PATCH] Fix CSS style issues
- Logo selection radio buttons not vertically centered (Firefox)
- font-size value incorrect in login.css
- Incorrect : placement in FAQ category edit
- Incorrect block width declaration (700 vs 700px)
- Browsers disagree on the placement of CSS3 outline properties
- Correctly place check boxes and radio buttons
---
include/client/faq.inc.php | 2 +-
include/staff/apikeys.inc.php | 2 +-
include/staff/cannedresponses.inc.php | 2 +-
include/staff/categories.inc.php | 2 +-
include/staff/category.inc.php | 2 +-
include/staff/departments.inc.php | 2 +-
include/staff/directory.inc.php | 2 +-
include/staff/emails.inc.php | 2 +-
include/staff/faq-category.inc.php | 2 +-
include/staff/faq-view.inc.php | 2 +-
include/staff/filter.inc.php | 2 +-
include/staff/filters.inc.php | 2 +-
include/staff/groups.inc.php | 2 +-
include/staff/helptopics.inc.php | 2 +-
include/staff/pages.inc.php | 2 +-
include/staff/settings-pages.inc.php | 6 ++++--
include/staff/slaplans.inc.php | 2 +-
include/staff/staffmembers.inc.php | 2 +-
include/staff/teams.inc.php | 2 +-
include/staff/templates.inc.php | 2 +-
scp/css/login.css | 30 ++++++++++++---------------
scp/css/scp.css | 4 +---
22 files changed, 37 insertions(+), 41 deletions(-)
diff --git a/include/client/faq.inc.php b/include/client/faq.inc.php
index d0be23c9f..a588eff5f 100644
--- a/include/client/faq.inc.php
+++ b/include/client/faq.inc.php
@@ -9,7 +9,7 @@ $category=$faq->getCategory();
<a href="index.php">All Categories</a>
» <a href="faq.php?cid=<?php echo $category->getId(); ?>"><?php echo $category->getName(); ?></a>
</div>
-<div style="width:700;padding-top:2px; float:left;">
+<div style="width:700px;padding-top:2px; float:left;">
<strong style="font-size:16px;"><?php echo $faq->getQuestion() ?></strong>
</div>
<div style="float:right;text-align:right;padding-top:5px;padding-right:5px;"></div>
diff --git a/include/staff/apikeys.inc.php b/include/staff/apikeys.inc.php
index 90b4e31ee..9f4375ca7 100644
--- a/include/staff/apikeys.inc.php
+++ b/include/staff/apikeys.inc.php
@@ -39,7 +39,7 @@ else
?>
-<div style="width:700;padding-top:5px; float:left;">
+<div style="width:700px;padding-top:5px; float:left;">
<h2>API Keys</h2>
</div>
<div style="float:right;text-align:right;padding-top:5px;padding-right:5px;">
diff --git a/include/staff/cannedresponses.inc.php b/include/staff/cannedresponses.inc.php
index 1a7316aa9..ef58ffda4 100644
--- a/include/staff/cannedresponses.inc.php
+++ b/include/staff/cannedresponses.inc.php
@@ -46,7 +46,7 @@ else
$showing='No premade responses found!';
?>
-<div style="width:700;padding-top:5px; float:left;">
+<div style="width:700px;padding-top:5px; float:left;">
<h2>Canned Responses</h2>
</div>
<div style="float:right;text-align:right;padding-top:5px;padding-right:5px;">
diff --git a/include/staff/categories.inc.php b/include/staff/categories.inc.php
index 293388d19..ca9d67b50 100644
--- a/include/staff/categories.inc.php
+++ b/include/staff/categories.inc.php
@@ -40,7 +40,7 @@ else
$showing='No FAQ categories found!';
?>
-<div style="width:700;padding-top:5px; float:left;">
+<div style="width:700px;padding-top:5px; float:left;">
<h2>FAQ Categories</h2>
</div>
<div style="float:right;text-align:right;padding-top:5px;padding-right:5px;">
diff --git a/include/staff/category.inc.php b/include/staff/category.inc.php
index c682219b0..f5a153dbc 100644
--- a/include/staff/category.inc.php
+++ b/include/staff/category.inc.php
@@ -3,7 +3,7 @@ if(!defined('OSTSCPINC') || !$thisstaff || !$thisstaff->canManageFAQ()) die('Acc
$info=array();
$qstr='';
if($category && $_REQUEST['a']!='add'){
- $title='Update Category :'.$category->getName();
+ $title='Update Category: '.$category->getName();
$action='update';
$submit_text='Save Changes';
$info=$category->getHashtable();
diff --git a/include/staff/departments.inc.php b/include/staff/departments.inc.php
index 64b668463..f78f4b3f7 100644
--- a/include/staff/departments.inc.php
+++ b/include/staff/departments.inc.php
@@ -40,7 +40,7 @@ else
$showing='No departments found!';
?>
-<div style="width:700;padding-top:5px; float:left;">
+<div style="width:700px;padding-top:5px; float:left;">
<h2>Departments</h2>
</div>
<div style="float:right;text-align:right;padding-top:5px;padding-right:5px;">
diff --git a/include/staff/directory.inc.php b/include/staff/directory.inc.php
index 1d44df3ef..d1c07f439 100644
--- a/include/staff/directory.inc.php
+++ b/include/staff/directory.inc.php
@@ -61,7 +61,7 @@ $query="$select $from $where GROUP BY staff.staff_id ORDER BY $order_by LIMIT ".
//echo $query;
?>
<h2>Staff Members</h2>
-<div style="width:700; float:left;">
+<div style="width:700px; float:left;">
<form action="directory.php" method="GET" name="filter">
<input type="text" name="q" value="<?php echo Format::htmlchars($_REQUEST['q']); ?>" >
<select name="did" id="did">
diff --git a/include/staff/emails.inc.php b/include/staff/emails.inc.php
index e5f035d1c..57bc48ff8 100644
--- a/include/staff/emails.inc.php
+++ b/include/staff/emails.inc.php
@@ -42,7 +42,7 @@ else
$showing='No emails found!';
?>
-<div style="width:700;padding-top:5px; float:left;">
+<div style="width:700px;padding-top:5px; float:left;">
<h2>Email Addresses</h2>
</div>
<div style="float:right;text-align:right;padding-top:5px;padding-right:5px;">
diff --git a/include/staff/faq-category.inc.php b/include/staff/faq-category.inc.php
index e7013192e..f12ed8ae8 100644
--- a/include/staff/faq-category.inc.php
+++ b/include/staff/faq-category.inc.php
@@ -2,7 +2,7 @@
if(!defined('OSTSTAFFINC') || !$category || !$thisstaff) die('Access Denied');
?>
-<div style="width:700;padding-top:10px; float:left;">
+<div style="width:700px;padding-top:10px; float:left;">
<h2>Frequently Asked Questions</h2>
</div>
<div style="float:right;text-align:right;padding-top:5px;padding-right:5px;"> </div>
diff --git a/include/staff/faq-view.inc.php b/include/staff/faq-view.inc.php
index ee7d743e4..0882197ec 100644
--- a/include/staff/faq-view.inc.php
+++ b/include/staff/faq-view.inc.php
@@ -10,7 +10,7 @@ $category=$faq->getCategory();
» <a href="kb.php?cid=<?php echo $category->getId(); ?>"><?php echo $category->getName(); ?></a>
<span class="faded">(<?php echo $category->isPublic()?'Public':'Internal'; ?>)</span>
</div>
-<div style="width:700;padding-top:2px; float:left;">
+<div style="width:700px;padding-top:2px; float:left;">
<strong style="font-size:16px;"><?php echo $faq->getQuestion() ?></strong> <span class="faded"><?php echo $faq->isPublished()?'(Published)':''; ?></span>
</div>
<div style="float:right;text-align:right;padding-top:5px;padding-right:5px;">
diff --git a/include/staff/filter.inc.php b/include/staff/filter.inc.php
index ef1081422..7ccecd79b 100644
--- a/include/staff/filter.inc.php
+++ b/include/staff/filter.inc.php
@@ -121,7 +121,7 @@ $info=Format::htmlchars(($errors && $_POST)?$_POST:$info);
for($i=1; $i<=$n; $i++){ ?>
<tr id="r<?php echo $i; ?>">
<td colspan="2">
- <div style="width:700; float:left;">
+ <div style="width:700px; float:left;">
<select name="rule_w<?php echo $i; ?>">
<option value="">— Select One ‐</option>
<?php
diff --git a/include/staff/filters.inc.php b/include/staff/filters.inc.php
index 106f80586..1f3969718 100644
--- a/include/staff/filters.inc.php
+++ b/include/staff/filters.inc.php
@@ -43,7 +43,7 @@ else
?>
-<div style="width:700;padding-top:5px; float:left;">
+<div style="width:700px;padding-top:5px; float:left;">
<h2>Ticket Filters</h2>
</div>
<div style="float:right;text-align:right;padding-top:5px;padding-right:5px;">
diff --git a/include/staff/groups.inc.php b/include/staff/groups.inc.php
index 64ea1a5b9..a100647b0 100644
--- a/include/staff/groups.inc.php
+++ b/include/staff/groups.inc.php
@@ -39,7 +39,7 @@ else
$showing='No groups found!';
?>
-<div style="width:700;padding-top:5px; float:left;">
+<div style="width:700px;padding-top:5px; float:left;">
<h2>User Groups</h2>
</div>
<div style="float:right;text-align:right;padding-top:5px;padding-right:5px;">
diff --git a/include/staff/helptopics.inc.php b/include/staff/helptopics.inc.php
index 1e15a023c..ed927d9fe 100644
--- a/include/staff/helptopics.inc.php
+++ b/include/staff/helptopics.inc.php
@@ -47,7 +47,7 @@ else
$showing='No help topic found!';
?>
-<div style="width:700;padding-top:5px; float:left;">
+<div style="width:700px;padding-top:5px; float:left;">
<h2>Help Topics</h2>
</div>
<div style="float:right;text-align:right;padding-top:5px;padding-right:5px;">
diff --git a/include/staff/pages.inc.php b/include/staff/pages.inc.php
index cb5fd243a..a1822e267 100644
--- a/include/staff/pages.inc.php
+++ b/include/staff/pages.inc.php
@@ -47,7 +47,7 @@ else
?>
-<div style="width:700;padding-top:5px; float:left;">
+<div style="width:700px;padding-top:5px; float:left;">
<h2>Site Pages</h2>
</div>
<div style="float:right;text-align:right;padding-top:5px;padding-right:5px;">
diff --git a/include/staff/settings-pages.inc.php b/include/staff/settings-pages.inc.php
index 4be256998..43c8ea4fe 100644
--- a/include/staff/settings-pages.inc.php
+++ b/include/staff/settings-pages.inc.php
@@ -87,7 +87,8 @@ $pages = Page::getPages();
<img src="../assets/default/images/logo.png"
alt="Default Logo" valign="middle"
style="box-shadow: 0 0 0.5em rgba(0,0,0,0.5);
- margin: 0.5em; height: 5em"/>
+ margin: 0.5em; height: 5em;
+ vertical-align: middle"/>
</label>
</td></tr>
<tr>
@@ -110,7 +111,8 @@ $pages = Page::getPages();
<img src="image.php?h=<?php echo $logo->getDownloadHash(); ?>"
alt="Custom Logo" valign="middle"
style="box-shadow: 0 0 0.5em rgba(0,0,0,0.5);
- margin: 0.5em; height: 5em;"/>
+ margin: 0.5em; height: 5em;
+ vertical-align: middle;"/>
</label>
<?php if ($logo->getId() != $current) { ?>
<label>
diff --git a/include/staff/slaplans.inc.php b/include/staff/slaplans.inc.php
index a731b7492..079de4103 100644
--- a/include/staff/slaplans.inc.php
+++ b/include/staff/slaplans.inc.php
@@ -39,7 +39,7 @@ else
?>
-<div style="width:700;padding-top:5px; float:left;">
+<div style="width:700px;padding-top:5px; float:left;">
<h2>Service Level Agreements</h2>
</div>
<div style="float:right;text-align:right;padding-top:5px;padding-right:5px;">
diff --git a/include/staff/staffmembers.inc.php b/include/staff/staffmembers.inc.php
index dcf708aa7..882039752 100644
--- a/include/staff/staffmembers.inc.php
+++ b/include/staff/staffmembers.inc.php
@@ -55,7 +55,7 @@ $query="$select $from $where GROUP BY staff.staff_id ORDER BY $order_by LIMIT ".
//echo $query;
?>
<h2>Staff Members</h2>
-<div style="width:700; float:left;">
+<div style="width:700px; float:left;">
<form action="staff.php" method="GET" name="filter">
<input type="hidden" name="a" value="filter" >
<select name="did" id="did">
diff --git a/include/staff/teams.inc.php b/include/staff/teams.inc.php
index f63cdb40e..0d33d7dfb 100644
--- a/include/staff/teams.inc.php
+++ b/include/staff/teams.inc.php
@@ -38,7 +38,7 @@ else
$showing='No teams found!';
?>
-<div style="width:700;padding-top:5px; float:left;">
+<div style="width:700px;padding-top:5px; float:left;">
<h2>Teams</h2>
</div>
<div style="float:right;text-align:right;padding-top:5px;padding-right:5px;">
diff --git a/include/staff/templates.inc.php b/include/staff/templates.inc.php
index 1e1057353..8f18d82d8 100644
--- a/include/staff/templates.inc.php
+++ b/include/staff/templates.inc.php
@@ -42,7 +42,7 @@ else
?>
-<div style="width:700;padding-top:5px; float:left;">
+<div style="width:700px;padding-top:5px; float:left;">
<h2>Email Templates</h2>
</div>
<div style="float:right;text-align:right;padding-top:5px;padding-right:5px;">
diff --git a/scp/css/login.css b/scp/css/login.css
index a15d4d12e..c2512a2bf 100644
--- a/scp/css/login.css
+++ b/scp/css/login.css
@@ -1,15 +1,6 @@
-* {
- box-sizing: border-box;
- position: relative;
- -moz-box-sizing: border-box;
- -webkit-box-sizing: border-box;
-}
-
-*:focus {
- outline-color: rgb(207,16,118);
- outline-style: auto;
- outline-width: 5px;
- z-index:1000;
+input:focus {
+ border: 1px solid rgb(207,16,118);
+ box-shadow: 0 0 4px rgb(207,16,118);
}
:-webkit-input-placeholder {
@@ -43,7 +34,6 @@ body {
body, input {
font-family: helvetica, arial, sans-serif;
- font-size: 100%/1.5;
color: #000;
}
@@ -59,11 +49,16 @@ input[type=reset], input[type=submit], input[type=button] {
border:1px solid #2a67ac;
border-right:2px solid #2a67ac;
border-bottom:3px solid #2a67ac;
+ box-shadow: 2px 2px 8px rgba(42, 103, 172, 0.5);
background:#fff;
width:400px;
margin:10% auto 0 auto;
padding:1em;
+ padding-bottom: 1em;
text-align:center;
+ -moz-box-sizing: border-box;
+ -webkit-box-sizing: border-box;
+ box-sizing: border-box;
}
h1 {
@@ -96,23 +91,24 @@ form {
fieldset {
border:none;
- margin:0;
+ margin:0.25em;
padding:0;
}
fieldset input {
display:block;
- width:100%;
margin-bottom:1em;
border:1px solid #ccc;
+ border:1px solid rgba(0,0,0,0.3);
background:#fff;
- padding:2px;
+ padding:2px 4px;
+ width: 96%;
}
input.submit {
display:inline-block;
float:right;
- margin:0;
+ margin:0.25em;
height:24px;
line-height:24px;
font-weight:bold;
diff --git a/scp/css/scp.css b/scp/css/scp.css
index 27da30ce7..560eaae90 100644
--- a/scp/css/scp.css
+++ b/scp/css/scp.css
@@ -544,8 +544,6 @@ a.print {
}
.form_table input[type=radio], .form_table input[type=checkbox] {
- position:relative;
- top:3px;
margin-left:0;
padding-left:0;
}
@@ -1124,7 +1122,7 @@ h2 .reload {
#faq {
clear: both;
margin: 0;
- padding: 5 0 10px 5px;
+ padding: 5px 0 10px 5px;
}
#faq ol {
font-size: 15px;
--
GitLab