Skip to content

Commit

Permalink
Working on Thread view more
Browse files Browse the repository at this point in the history
  • Loading branch information
@bnvk
bnvk committed Dec 25, 2013
1 parent 0007324 commit 44d1b63
Show file tree
Hide file tree
Showing 5 changed files with 422 additions and 53 deletions.
252 changes: 251 additions & 1 deletion static/default/css/default.css
View file
Original file line number Diff line number Diff line change
Expand Up @@ -316,6 +316,7 @@ you can use the generic selector below, but it's slower:
/* Buttons */
/* Forms */
/* Tables */
/* Bootstrap - Dropdown */
/* Mixins */
@charset "UTF-8";
/*
Expand Down Expand Up @@ -5432,6 +5433,248 @@ x:-o-prefocus,
display: inline-block;
visibility: visible;
}
.dropup,
.dropdown {
position: relative;
}
.dropdown-toggle {
*margin-bottom: -3px;
}
.dropdown-toggle:active,
.open .dropdown-toggle {
outline: 0;
}
.caret {
display: inline-block;
width: 0;
height: 0;
vertical-align: top;
border-top: 4px solid #333333;
border-right: 4px solid transparent;
border-left: 4px solid transparent;
content: "";
}
.dropdown .caret {
margin-top: 8px;
margin-left: 2px;
}
.dropdown-menu {
position: absolute;
top: 100%;
left: 0;
z-index: 10;
display: none;
float: left;
min-width: 160px;
padding: 5px 0;
margin: 2px 0 0;
list-style: none;
background-color: #ffffff;
border: 1px solid #ccc;
border: 1px solid rgba(0, 0, 0, 0.2);
*border-right-width: 2px;
*border-bottom-width: 2px;
-webkit-border-top-right-radius: 6px;
-webkit-border-bottom-right-radius: 0;
-webkit-border-bottom-left-radius: 0;
-webkit-border-top-left-radius: 0;
-moz-border-radius-topright: 6px;
-moz-border-radius-bottomright: 0;
-moz-border-radius-bottomleft: 0;
-moz-border-radius-topleft: 0;
border-top-right-radius: 6px;
border-bottom-right-radius: 0;
border-bottom-left-radius: 0;
border-top-left-radius: 0;
-moz-background-clip: padding-box;
-webkit-box-shadow: 0 5px 10px rgba(0, 0, 0, 0.2);
-moz-box-shadow: 0 5px 10px rgba(0, 0, 0, 0.2);
box-shadow: 0 5px 10px rgba(0, 0, 0, 0.2);
-webkit-background-clip: padding-box;
-moz-background-clip: padding;
background-clip: padding-box;
}
.dropdown-menu.pull-right {
right: 0;
left: auto;
}
.dropdown-menu .divider {
*width: 100%;
height: 1px;
margin: 9px 1px;
*margin: -5px 0 5px;
overflow: hidden;
background-color: #e5e5e5;
border-bottom: 1px solid #ffffff;
}
.dropdown-menu > li > a {
display: block;
padding: 3px 20px;
clear: both;
font-weight: normal;
line-height: 20px;
color: #4d4d4d;
white-space: nowrap;
}
.dropdown-menu > li > a:hover,
.dropdown-menu > li > a:focus,
.dropdown-submenu:hover > a,
.dropdown-submenu:focus > a {
text-decoration: none;
color: #ffffff;
background: #4d4d4d;
}
.dropdown-menu > .active > a,
.dropdown-menu > .active > a:hover,
.dropdown-menu > .active > a:focus {
color: #ffffff;
text-decoration: none;
outline: 0;
}
.dropdown-menu > .disabled > a,
.dropdown-menu > .disabled > a:hover,
.dropdown-menu > .disabled > a:focus {
color: #f2f2f2;
}
.dropdown-menu > .disabled > a:hover,
.dropdown-menu > .disabled > a:focus {
text-decoration: none;
background-color: transparent;
background-image: none;
filter: progid:DXImageTransform.Microsoft.gradient(enabled = false);
cursor: default;
}
.open {
*z-index: 10;
}
.open > .dropdown-menu {
display: block;
}
.pull-right > .dropdown-menu {
right: 0;
left: auto;
}
.dropup .caret,
.navbar-fixed-bottom .dropdown .caret {
border-top: 0;
border-bottom: 4px solid #333333;
content: "";
}
.dropup .dropdown-menu,
.navbar-fixed-bottom .dropdown .dropdown-menu {
top: auto;
bottom: 100%;
margin-bottom: 1px;
}
.dropdown-submenu {
position: relative;
}
.dropdown-submenu > .dropdown-menu {
top: 0;
left: 100%;
margin-top: -6px;
margin-left: -1px;
-webkit-border-top-right-radius: 0 6px 6px 6px;
-webkit-border-bottom-right-radius: 0;
-webkit-border-bottom-left-radius: 0;
-webkit-border-top-left-radius: 0;
-moz-border-radius-topright: 0 6px 6px 6px;
-moz-border-radius-bottomright: 0;
-moz-border-radius-bottomleft: 0;
-moz-border-radius-topleft: 0;
border-top-right-radius: 0 6px 6px 6px;
border-bottom-right-radius: 0;
border-bottom-left-radius: 0;
border-top-left-radius: 0;
-moz-background-clip: padding-box;
-webkit-background-clip: padding-box;
background-clip: padding-box;
}
.dropdown-submenu:hover > .dropdown-menu {
display: block;
}
.dropup .dropdown-submenu > .dropdown-menu {
top: auto;
bottom: 0;
margin-top: 0;
margin-bottom: -2px;
-webkit-border-top-right-radius: 5px 5px 5px 0;
-webkit-border-bottom-right-radius: 0;
-webkit-border-bottom-left-radius: 0;
-webkit-border-top-left-radius: 0;
-moz-border-radius-topright: 5px 5px 5px 0;
-moz-border-radius-bottomright: 0;
-moz-border-radius-bottomleft: 0;
-moz-border-radius-topleft: 0;
border-top-right-radius: 5px 5px 5px 0;
border-bottom-right-radius: 0;
border-bottom-left-radius: 0;
border-top-left-radius: 0;
-moz-background-clip: padding-box;
-webkit-background-clip: padding-box;
background-clip: padding-box;
}
.dropdown-submenu > a:after {
display: block;
content: " ";
float: right;
width: 0;
height: 0;
border-color: transparent;
border-style: solid;
border-width: 5px 0 5px 5px;
border-left-color: #cccccc;
margin-top: 5px;
margin-right: -10px;
}
.dropdown-submenu:hover > a:after {
border-left-color: #ffffff;
}
.dropdown-submenu.pull-left {
float: none;
}
.dropdown-submenu.pull-left > .dropdown-menu {
left: -100%;
margin-left: 10px;
-webkit-border-top-right-radius: 6px 0 6px 6px;
-webkit-border-bottom-right-radius: 0;
-webkit-border-bottom-left-radius: 0;
-webkit-border-top-left-radius: 0;
-moz-border-radius-topright: 6px 0 6px 6px;
-moz-border-radius-bottomright: 0;
-moz-border-radius-bottomleft: 0;
-moz-border-radius-topleft: 0;
border-top-right-radius: 6px 0 6px 6px;
border-bottom-right-radius: 0;
border-bottom-left-radius: 0;
border-top-left-radius: 0;
-moz-background-clip: padding-box;
-webkit-background-clip: padding-box;
background-clip: padding-box;
}
.dropdown .dropdown-menu .nav-header {
padding-left: 20px;
padding-right: 20px;
}
.typeahead {
z-index: 1051;
margin-top: 2px;
-webkit-border-top-right-radius: 5px;
-webkit-border-bottom-right-radius: 0;
-webkit-border-bottom-left-radius: 0;
-webkit-border-top-left-radius: 0;
-moz-border-radius-topright: 5px;
-moz-border-radius-bottomright: 0;
-moz-border-radius-bottomleft: 0;
-moz-border-radius-topleft: 0;
border-top-right-radius: 5px;
border-bottom-right-radius: 0;
border-bottom-left-radius: 0;
border-top-left-radius: 0;
-moz-background-clip: padding-box;
-webkit-background-clip: padding-box;
background-clip: padding-box;
}
/* App */
/* Messages - Error, Warning, Debug, Info, Success */
#messages {
Expand Down Expand Up @@ -6390,13 +6633,17 @@ a.compose-show-field {
}
/* Thread Reply */
#thread-reply {
min-height: 225px;
padding: 10px 15px;
background: #f2f2f2;
border-top: 1px solid #b3b3b3;
}
#thread-reply-actions {
padding: 10px;
}
#reply-textarea {
width: 96%;
padding: 10px;
width: 100%;
border: 1px solid #cccccc;
font-size: 14px;
line-height: 18px;
Expand All @@ -6408,6 +6655,9 @@ a.compose-show-field {
#reply-options li {
margin-left: 25px;
}
#thread-reply-details {
display: none;
}
.message-headers {
padding: 15px;
border-bottom: 1px solid #b3b3b3;
Expand Down
46 changes: 23 additions & 23 deletions static/default/html/layouts/base.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,29 @@

<title>{{title}} | {{name}}'s mailpile</title>

<script type="text/javascript" src="/static/js/libraries/jquery.min.js"></script>
<script type="text/javascript" src="/static/js/libraries-min.js"></script>
<script type="text/javascript" src="/static/js/libraries/d3.v3.min.js"></script>
<script type="text/javascript" src="/static/js/mailpile.js"></script>
<script type="text/javascript" src="/static/js/app/notifications.js"></script>
<script type="text/javascript" src="/static/js/app/tooltips.js"></script>
<script type="text/javascript" src="/static/js/app/gpg.js"></script>
<script type="text/javascript" src="/static/js/app/compose.js"></script>
<script type="text/javascript" src="/static/js/app/pile.js"></script>
<script type="text/javascript" src="/static/js/app/search.js"></script>
<script type="text/javascript" src="/static/js/app/thread.js"></script>
<script type="text/javascript" src="/static/js/app/contacts.js"></script>
<script type="text/javascript" src="/static/js/app/tags.js"></script>
<script type="text/javascript" src="/static/js/app/settings.js"></script>
<script type="text/javascript">
mailpile.instance = {
"command": "{{ command }}",
"args": "{{ args }}",
"search_terms": "{% for term in result.search_terms %}{{term}}{% if not loop.last %} {% endif %}{%endfor%}"
}
</script>
<script type="text/javascript" src="/static/js/plugins-min.js"></script>

</head>
<body>

Expand Down Expand Up @@ -178,28 +201,5 @@ <h3>DEBUG</h3>
</ul>
</div>

<script type="text/javascript" src="/static/js/libraries/jquery.min.js"></script>
<script type="text/javascript" src="/static/js/libraries-min.js"></script>
<script type="text/javascript" src="/static/js/libraries/d3.v3.min.js"></script>
<script type="text/javascript" src="/static/js/mailpile.js"></script>
<script type="text/javascript" src="/static/js/app/notifications.js"></script>
<script type="text/javascript" src="/static/js/app/tooltips.js"></script>
<script type="text/javascript" src="/static/js/app/gpg.js"></script>
<script type="text/javascript" src="/static/js/app/compose.js"></script>
<script type="text/javascript" src="/static/js/app/pile.js"></script>
<script type="text/javascript" src="/static/js/app/search.js"></script>
<script type="text/javascript" src="/static/js/app/thread.js"></script>
<script type="text/javascript" src="/static/js/app/contacts.js"></script>
<script type="text/javascript" src="/static/js/app/tags.js"></script>
<script type="text/javascript" src="/static/js/app/settings.js"></script>
<script type="text/javascript">
mailpile.instance = {
"command": "{{ command }}",
"args": "{{ args }}",
"search_terms": "{% for term in result.search_terms %}{{term}}{% if not loop.last %} {% endif %}{%endfor%}"
}
</script>
<script type="text/javascript" src="/static/js/plugins-min.js"></script>

</body>
</html>

0 comments on commit 44d1b63

Please sign in to comment.