dhis2-devs team mailing list archive
-
dhis2-devs team
-
Mailing list archive
-
Message #30835
[Branch ~dhis2-devs-core/dhis2/trunk] Rev 15678: CSS code style
------------------------------------------------------------
revno: 15678
committer: Lars Helge Overland <larshelge@xxxxxxxxx>
branch nick: dhis2
timestamp: Sat 2014-06-14 18:01:44 +0200
message:
CSS code style
modified:
dhis-2/dhis-web/dhis-web-tracker-capture/src/main/webapp/dhis-web-tracker-capture/styles/style.css
--
lp:dhis2
https://code.launchpad.net/~dhis2-devs-core/dhis2/trunk
Your team DHIS 2 developers is subscribed to branch lp:dhis2.
To unsubscribe from this branch go to https://code.launchpad.net/~dhis2-devs-core/dhis2/trunk/+edit-subscription
=== modified file 'dhis-2/dhis-web/dhis-web-tracker-capture/src/main/webapp/dhis-web-tracker-capture/styles/style.css'
--- dhis-2/dhis-web/dhis-web-tracker-capture/src/main/webapp/dhis-web-tracker-capture/styles/style.css 2014-06-06 13:35:06 +0000
+++ dhis-2/dhis-web/dhis-web-tracker-capture/src/main/webapp/dhis-web-tracker-capture/styles/style.css 2014-06-14 16:01:44 +0000
@@ -23,16 +23,20 @@
font-weight: bold;
}
-div#orgUnitTree
-{
+div#leftBar {
+ width: 236px;
+}
+
+div#orgUnitTree {
height: 75%;
}
+
+
/*----------------------------------------------------------------------------*/
/* Form
/*----------------------------------------------------------------------------*/
-input[type="button"], input[type="submit"]
-{
+input[type="button"], input[type="submit"] {
width: 130px;
}
@@ -40,18 +44,15 @@
width: 260px;
}
-input.option
-{
+input.option {
width: 240px;
}
-.fixed-select-width
-{
+.fixed-select-width {
width: 260px;
}
-textarea
-{
+textarea {
width: 264px;
}
@@ -59,8 +60,7 @@
/* Table
/*----------------------------------------------------------------------------*/
-table
-{
+table {
font-size: 13px;
line-height: 18px;
margin-bottom: 10px;
@@ -85,27 +85,21 @@
}
/*----------------------------------------------------------------------------*/
-/* Data entry form */
+/* Data entry form
/*----------------------------------------------------------------------------*/
-.entryScreen
-{
+.entryScreen {
margin-bottom: 20px;
width: 100%;
font-size: 13px;
line-height: 18px;
}
-/* --------------------------------------------------------------
-// Dashboard
-// -------------------------------------------------------------- */
-
-
-/* --------------------------------------------------------------
-// program-stage-instances
-// -------------------------------------------------------------- */
-
-.data-entry{
+/*----------------------------------------------------------------------------*/
+/* Program-stage-instances
+/*----------------------------------------------------------------------------*/
+
+.data-entry {
overflow: scroll;
}
@@ -114,33 +108,28 @@
width: 10px;
}
-.stage-container
-{
+.stage-container {
width:100%;
height:100px;
}
-.stage-flow
-{
+.stage-flow {
height:100px;
overflow: scroll;
}
-.table-flow
-{
+.table-flow {
height:100px;
overflow-x:hidden;
overflow-y:hidden;
}
-div.orgunit-object
-{
+div.orgunit-object {
margin-left: 5px;
width: 120px;
}
-.align-center
-{
+.align-center {
text-align: center;
}
@@ -151,12 +140,12 @@
.clear {
clear: both;
}
+
.inline-block {
display: inline-block;
}
-.stage-container
-{
+.stage-container {
display: inline-block;
width: 135px;
height: 60px;
@@ -168,8 +157,7 @@
text-align: center;
}
-.stage-container:hover
-{
+.stage-container:hover {
border: 2px solid;
}
@@ -189,11 +177,11 @@
background-color: #ff8a8a;
}
-.current-stage{
+.current-stage {
border: 2px solid;
}
-.current-stage-color{
+.current-stage-color {
color: #b94a48;
}
@@ -201,8 +189,7 @@
display: block;
}
-input.stage-object[type="button"]
-{
+input.stage-object[type="button"] {
width: 135px;
height: 60px;
cursor: pointer;
@@ -212,47 +199,41 @@
white-space: normal;
}
-input.stage-object[type="button"]:hover
-{
- border: 5px solid;
-}
-
-input.stage-object-selected[type="button"]
-{
- border: 5px solid;
-}
-
-input.stage-scheduled[type="button"]
-{
- border: 5px solid;
-}
-
-input.entity-instance-object[type="button"]
-{
- width: 130px;
- height: 60px;
- border-color: #bbbbbb;
- background-color: #ddd;
- cursor: pointer;
- border: 1px solid #aaa;
- margin: 5px;
- border-radius: 2px;
-}
-
-input.patient-object[type="button"]
-{
- width: 130px;
- height: 60px;
- border-color: #bbbbbb;
- background-color: #ddd;
- cursor: pointer;
- border: 1px solid #aaa;
- margin: 5px;
- border-radius: 2px;
-}
-
-div.dashboard-history
-{
+input.stage-object[type="button"]:hover {
+ border: 5px solid;
+}
+
+input.stage-object-selected[type="button"] {
+ border: 5px solid;
+}
+
+input.stage-scheduled[type="button"] {
+ border: 5px solid;
+}
+
+input.entity-instance-object[type="button"] {
+ width: 130px;
+ height: 60px;
+ border-color: #bbbbbb;
+ background-color: #ddd;
+ cursor: pointer;
+ border: 1px solid #aaa;
+ margin: 5px;
+ border-radius: 2px;
+}
+
+input.patient-object[type="button"] {
+ width: 130px;
+ height: 60px;
+ border-color: #bbbbbb;
+ background-color: #ddd;
+ cursor: pointer;
+ border: 1px solid #aaa;
+ margin: 5px;
+ border-radius: 2px;
+}
+
+div.dashboard-history {
z-index:100;
width:300px;
height:200px;
@@ -271,8 +252,7 @@
/* Program tracking
/*----------------------------------------------------------------------------*/
-div.link-area-tracking
-{
+div.link-area-tracking {
display:inline-block;
border:1px solid #d0d0d0;
padding-top:1px;
@@ -296,32 +276,30 @@
border-color: #aaa;
}
-
-/* --------------------------------------------------------------
-// Capture Coordinates
-// -------------------------------------------------------------- */
-
-.coordinates1{
+/*----------------------------------------------------------------------------*/
+/* Capture Coordinates
+/*----------------------------------------------------------------------------*/
+
+.coordinates1 {
width: 110px;
white-space: normal;
}
-.coordinates2{
+.coordinates2 {
width: 150px;
}
-.commentHeader
-{
+.commentHeader {
color: #606060;
font-size: 17px;
padding: 5px 0;
}
-/* --------------------------------------------------------------
-// App - specific
-// -------------------------------------------------------------- */
+/*----------------------------------------------------------------------------*/
+/* App - specific
+/*----------------------------------------------------------------------------*/
.container-heading {
color: white;
@@ -372,8 +350,7 @@
float: left;
}
-.bordered-div
-{
+.bordered-div {
border: 1px solid #c2c2c2;
border-radius: 5px;
padding: 5px 10px;
@@ -434,6 +411,7 @@
border-top: none;
background-color: #ebf0f6;
}
+
.dhis2-table-striped-border {
width: 100%;
border-collapse: collapse;
@@ -441,7 +419,6 @@
table-layout: fixed;
}
-
.dhis2-table-striped-border tr th {
border: 1px solid #cad5e5;
}
@@ -604,6 +581,7 @@
margin-bottom: 5px;
margin-top: 5px;
}
+
/*----------------------------------------------------------------------------*/
/* Bootstrap modal style
/*----------------------------------------------------------------------------*/
@@ -811,6 +789,7 @@
.alert {
padding: 5px;
}
+
.input-field {
border: 1px solid #aaa;
padding: 4px 1px;
@@ -870,7 +849,7 @@
transition: border-color ease-in-out .15s, box-shadow ease-in-out .15s
}
-.underline{
+.underline {
text-decoration: underline;
}