Permalink
Browse files

Merge

  • Loading branch information...
1 parent 013412b commit 3374ffaf709a4d0a8e964f7ad2186c307e8a0f8e @elmarbransch committed Apr 5, 2012
@@ -521,7 +521,7 @@
<div class="taskOptions noPrint">
<table><tbody>
- <tr>
+ <tr style="display:none;">
<td class="taskOptionName lang lang_ACCOUNT_MAIN_CONTENT_TICK_IF_HEADER"></td>
<td>
<select name="taskOptionHeader" class="taskOptionHeader">
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
View
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Oops, something went wrong.
@@ -6,6 +6,9 @@
width: 100%;
height: 38px;
padding: 2px 3px;
+ -webkit-box-shadow: 0px 0px 10px 1px #000;
+ -moz-box-shadow: 0px 0px 10px 1px #000;
+ box-shadow: 0px 0px 10px 1px #000;
}
#bottomPanel > div {
@@ -95,6 +98,28 @@
-moz-box-shadow: 0px 1px 0px 0px #606060;
box-shadow: 0px 1px 0px 0px #606060;
}
+
+#todayToInbox {
+ font-size: 12px;
+ -webkit-border-radius: 15px;
+ -moz-border-radius: 15px;
+ border-radius: 15px;
+ height:16px;
+ border: 1px solid #1f1f1f;
+ background: #7bc0ed; /* Old browsers */
+ background: -moz-linear-gradient(top, #7bc0ed 5%, #2e9fea 5%, #1568a3 99%); /* FF3.6+ */
+ background: -webkit-gradient(linear, left top, left bottom, color-stop(5%,#7bc0ed), color-stop(5%,#2e9fea), color-stop(99%,#1568a3)); /* Chrome,Safari4+ */
+ background: -webkit-linear-gradient(top, #7bc0ed 5%,#2e9fea 5%,#1568a3 99%); /* Chrome10+,Safari5.1+ */
+ background: -o-linear-gradient(top, #7bc0ed 5%,#2e9fea 5%,#1568a3 99%); /* Opera 11.10+ */
+ background: -ms-linear-gradient(top, #7bc0ed 5%,#2e9fea 5%,#1568a3 99%); /* IE10+ */
+ background: linear-gradient(top, #7bc0ed 5%,#2e9fea 5%,#1568a3 99%); /* W3C */
+ filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#7bc0ed', endColorstr='#1568a3',GradientType=0 ); /* IE6-9 */
+ color: #fff;
+ -webkit-box-shadow: 0px 1px 0px 0px #606060;
+ -moz-box-shadow: 0px 1px 0px 0px #606060;
+ box-shadow: 0px 1px 0px 0px #606060;
+}
+
#bottomPanel #accountButton .ui-button-text:hover {
font-size: 12px;
}
@@ -267,4 +292,4 @@
#bottomPanel #todayToInbox .ui-button-text {
font-size: 12px;
}
-.bottomPanelFiller { color:#3c3c3c !important;}
+.bottomPanelFiller { display:none !important;}
@@ -36,8 +36,8 @@ ul#lists li.selected .inboxCounter {
-webkit-box-shadow: inset 1px 1px 6px #aaa;
-moz-box-shadow: inset 1px 1px 6px #aaa;
box-shadow: inset 1px 1px 6px #aaa;
- background-color: #E8ECFF;
- color: #999;
+ background-color: #f3f3f3;
+ color: #000;
width: 28px;
}
@@ -59,8 +59,8 @@ ul#lists li.selected .todoCounter {
-webkit-box-shadow: inset 1px 1px 6px #aaa;
-moz-box-shadow: inset 1px 1px 6px #aaa;
box-shadow: inset 1px 1px 6px #aaa;
- background-color: #E8ECFF;
- color: #999;
+ background-color: #f3f3f3;
+ color: #000;
width: 28px;
}
@@ -30,7 +30,7 @@ h1:hover {
}
h3 {
- font-weight: bold;
+ font-weight: 300;
font-size: 140%;
width: 100%;
/* border-bottom: 2px solid #1C94C4; */
@@ -103,7 +103,9 @@ div.dragging {
}
-#bottomFilters .ui-state-default, .ui-widget-content .ui-state-default, .ui-widget-header .ui-state-default {
+#bottomFilters .ui-state-default,
+#bottomFilters .ui-widget-content .ui-state-default,
+#bottomFilters .ui-widget-header .ui-state-default {
border: 1px solid #1f1f1f;
background: #313131;
font-weight: normal;
@@ -134,7 +136,8 @@ div.dragging {
box-shadow: inset 0px 2px 3px 0px #202020;
-webkit-box-shadow: 0px 1px 0px 0px #606060;
-moz-box-shadow: 0px 1px 0px 0px #606060;
- box-shadow: 0px 1px 0px 0px #606060;
+ box-shadow: 0px 1px 0px 0px #606060;
+ margin-top:4px;
}
#bottomFilters label[for=filterCompleted] {
@@ -198,3 +201,6 @@ input, select {
font-size: 0.75em;
}
+.taskDescrShortcutsHelp { display:none !important;}
+.addTaskBottom { display:none !important;}
+.collapseListsBtn { display:none !important;}
@@ -109,6 +109,7 @@ div.panelActions {
border-radius: 8px 8px 8px 8px;
-moz-border-radius: 8px;
-webkit-border-radius: 8px;
+ display: none;
}
.panelAction {
@@ -2,6 +2,15 @@ ul#lists {
margin-bottom: 0px;
}
+
+ul#lists li:first-child:before{
+ content: url(/app/desktop/img/inbox_black.png);
+}
+ul#lists li:first-child.selected:before{
+ content: url(/app/desktop/img/inbox_white.png);
+}
+
+
#hackToScrollToBottomList {
display: block;
width: 1px;
@@ -58,7 +67,7 @@ ul#lists li.selected, ul#tags li.selected {
div#listsTitle, div#tagsTitle {
position: relative;
- width: 200px;
+ width: 250px;
margin-bottom: 4px;
}
@@ -115,9 +124,14 @@ ul#lists .header {
#listsActions a, #tagsActions a {
float: right;
- margin-left: 7px;
font-size: 80%;
+ border:none !important;
+ background:url(/app/desktop/img/minkenberg/icon.png) -42px -38px !important;
+ text-indent:-9999 !important;
+ #fff !important;
+ width:24px !important;
}
+#listsActions a, #tagsActions a:hover { background-position: -16px -38px !important;}
/* MM Mod */
@@ -132,5 +146,7 @@ ul#lists .header {
padding-bottom: 5px;
height: 14px;
font-family: 'Lato', sans-serif;
+ margin-left:5px;
}
+
@@ -65,14 +65,17 @@ ul.tasks li.task {
}
a.taskOptionsLink {
- background: url('/app/desktop/img/more_icon.png') no-repeat;
+ display:none !important;
+ /*
+ background: url('/app/desktop/img/more_icon.png') no-repeat;
float: right;
margin-right: 20px;
padding-left: 19px;
text-decoration: none;
color: #eee;
margin-top: 10px;
font-size: 0.8em;
+ */
}
a.taskOptionsLink:hover {
@@ -95,7 +98,8 @@ a.taskOptionsLink:hover {
.noTasks {
padding: 20px;
- color: #666;
+ color: #fff;
+ text-shadow: 0px 0px 6px black;
}
.addTaskBottom {
@@ -219,11 +223,12 @@ ul.completedTasks li span {
font-size: 12px;
white-space: nowrap;
height: 25px;
- margin-right: 50px;
+ margin: 0 5px 0 5px;
+ font-weight:bold;
}
.taskDueTime {
- color: #3333ff;
+ color: #838383;
font-size: 13px;
white-space: nowrap;
height: 25px;
@@ -266,10 +271,12 @@ ul.completedTasks li span {
.taskFilters {
margin-bottom: 15px;
font-size: 0.9em;
- text-shadow: 0px 0px 2px #fff;
+ text-shadow: 0px 0px 6px #000;
+ color:#fff !important;
}
.hideScheduledTasks {
+ margin-left:5px;
display: block;
text-align: left;
/* padding-top: 3px; */
@@ -329,7 +336,7 @@ div.newTaskInCalButton .ui-button-text {
/* MM added */
.taskNoteIcon {
position: relative;
- top: 4px;
+ top: 1px;
}
ul.tasks {
@@ -358,3 +365,19 @@ ul.tasks .ui-state-highlight {
.taskFilters select {
font-size: 1.0em !important;
}
+
+
+.ui-icon-pencil {
+ background:url(/app/desktop/img/minkenberg/icon.png) -161px -12px !important;
+}
+.ui-icon-pencil:hover {
+ background:url(/app/desktop/img/minkenberg/icon.png) -137px -12px !important;
+}
+
+.ui-icon-arrowreturnthick-1-e { display:none !important;}
+.addBelowTask { display:none !important;}
+.addBelowList { display:none !important;}
+.editTask { border:none !important; color: #fff !important; background: none!important;}
+.editTag { border:none !important; color: #fff !important; background: none!important; top: 8px;right: 10px;}
+.editList { border:none !important; color: #fff !important; background: none!important; top: 8px;right: 50px;}
+.taskNoteIcon { margin-left:5px;}
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file not shown.

0 comments on commit 3374ffa

Please sign in to comment.