[Git][noosfero/noosfero][rails4] 2 commits: Merge tasks.css file
Bráulio Bhavamitra
gitlab at gitlab.com
Fri Oct 2 17:22:20 BRT 2015
Bráulio Bhavamitra pushed to branch rails4 at Noosfero / noosfero
Commits:
47aff270 by Braulio Bhavamitra at 2015-10-02T17:21:01Z
Merge tasks.css file
- - - - -
cec323ee by Braulio Bhavamitra at 2015-10-02T17:21:34Z
Merge branch 'master' of https://gitlab.com/noosfero/noosfero into rails4
- - - - -
2 changed files:
- − public/stylesheets/tasks.css
- public/stylesheets/tasks.scss
Changes:
=====================================
public/stylesheets/tasks.css deleted
=====================================
--- a/public/stylesheets/tasks.css
+++ /dev/null
@@ -1,55 +0,0 @@
-.task_box {
- position: relative;
- border: 1px solid #888;
- -moz-border-radius: 10px;
- -webkit-border-radius: 10px;
- -khtml-border-radius: 10px;
- border-radius: 10px;
- padding: 6px 4px 9px 4px;
- margin-top: 5px;
- background: #EEE;
-}
-
-.task_title {
- margin: 0px;
- display: block;
- line-height: 28px;
- font-size: 120%;
-}
-
-.task_date {
- color: gray;
- font-size: 12px;
-}
-
-.task_icon {
- float: left;
- margin-right: 10px;
- width: 50px;
- height: 50px;
- text-align: center;
-}
-
-.task_decisions {
- float: right;
- padding-right: 5px;
-}
-
-.task_information {
- line-height: 18px;
- padding: 2px 0px;
- clear: right;
-}
-
-.task_information p {
- margin: 0px;
-}
-
-.task_target {
- text-decoration: underline;
- font-weight: bold;
-}
-
-.task_responsible {
- text-align: right;
-}
=====================================
public/stylesheets/tasks.scss
=====================================
--- a/public/stylesheets/tasks.scss
+++ b/public/stylesheets/tasks.scss
@@ -25,3 +25,59 @@ div.pending-tasks {
padding-left: 0px;
list-style-type: none;
}
+
+.task_box {
+ position: relative;
+ border: 1px solid #888;
+ -moz-border-radius: 10px;
+ -webkit-border-radius: 10px;
+ -khtml-border-radius: 10px;
+ border-radius: 10px;
+ padding: 6px 4px 9px 4px;
+ margin-top: 5px;
+ background: #EEE;
+}
+
+.task_title {
+ margin: 0px;
+ display: block;
+ line-height: 28px;
+ font-size: 120%;
+}
+
+.task_date {
+ color: gray;
+ font-size: 12px;
+}
+
+.task_icon {
+ float: left;
+ margin-right: 10px;
+ width: 50px;
+ height: 50px;
+ text-align: center;
+}
+
+.task_decisions {
+ float: right;
+ padding-right: 5px;
+}
+
+.task_information {
+ line-height: 18px;
+ padding: 2px 0px;
+ clear: right;
+}
+
+.task_information p {
+ margin: 0px;
+}
+
+.task_target {
+ text-decoration: underline;
+ font-weight: bold;
+}
+
+.task_responsible {
+ text-align: right;
+}
View it on GitLab: https://gitlab.com/noosfero/noosfero/compare/f09b8e4ef57224770d75b53b96d987915a9e7930...cec323eef7e909f0416e7b9230597fb924570355
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://listas.softwarelivre.org/pipermail/noosfero-dev/attachments/20151002/e42611f2/attachment.html>
More information about the Noosfero-dev
mailing list