From 93eda9d9c1deb50cfa36392dbcbc4dc56883160f Mon Sep 17 00:00:00 2001 From: Fabio Comuni Date: Fri, 22 Jul 2011 17:37:51 +0200 Subject: Initial work on new UI --- view/nav.tpl | 70 ++++- view/theme/quattro/LIBERATION-FONTS-COPYING | 339 +++++++++++++++++++++ view/theme/quattro/LiberationSans-Bold.ttf | Bin 0 -> 136664 bytes view/theme/quattro/LiberationSans-Italic.ttf | Bin 0 -> 161532 bytes view/theme/quattro/LiberationSans-Regular.ttf | Bin 0 -> 139036 bytes .../quattro/liberation-fonts-ttf-1.07.0.tar.gz | Bin 0 -> 1326750 bytes view/theme/quattro/style.css | 168 ++++++++++ view/theme/quattro/style.less | 193 ++++++++++++ 8 files changed, 758 insertions(+), 12 deletions(-) create mode 100644 view/theme/quattro/LIBERATION-FONTS-COPYING create mode 100644 view/theme/quattro/LiberationSans-Bold.ttf create mode 100644 view/theme/quattro/LiberationSans-Italic.ttf create mode 100644 view/theme/quattro/LiberationSans-Regular.ttf create mode 100644 view/theme/quattro/liberation-fonts-ttf-1.07.0.tar.gz create mode 100644 view/theme/quattro/style.css create mode 100644 view/theme/quattro/style.less (limited to 'view') diff --git a/view/nav.tpl b/view/nav.tpl index 09a25ac83..3a458b193 100644 --- a/view/nav.tpl +++ b/view/nav.tpl @@ -1,7 +1,63 @@ -$langselector +{# $langselector #}
$sitelocation
+ + + + +{# + {{ if $nav.logout }}$nav.logout.1 {{ endif }} {{ if $nav.login }}$nav.login.1 {{ endif }} @@ -18,17 +74,6 @@ $langselector {{ if $nav.admin }}$nav.admin.1{{ endif }} -{{ if $nav.network }} -$nav.network.1 - -{{ endif }} -{{ if $nav.home }} -$nav.home.1 - -{{ endif }} -{{ if $nav.community }} -$nav.community.1 -{{ endif }} {{ if $nav.notifications }} $nav.notifications.1 @@ -47,3 +92,4 @@ $langselector +#} diff --git a/view/theme/quattro/LIBERATION-FONTS-COPYING b/view/theme/quattro/LIBERATION-FONTS-COPYING new file mode 100644 index 000000000..d511905c1 --- /dev/null +++ b/view/theme/quattro/LIBERATION-FONTS-COPYING @@ -0,0 +1,339 @@ + GNU GENERAL PUBLIC LICENSE + Version 2, June 1991 + + Copyright (C) 1989, 1991 Free Software Foundation, Inc., + 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + Everyone is permitted to copy and distribute verbatim copies + of this license document, but changing it is not allowed. + + Preamble + + The licenses for most software are designed to take away your +freedom to share and change it. By contrast, the GNU General Public +License is intended to guarantee your freedom to share and change free +software--to make sure the software is free for all its users. This +General Public License applies to most of the Free Software +Foundation's software and to any other program whose authors commit to +using it. (Some other Free Software Foundation software is covered by +the GNU Lesser General Public License instead.) You can apply it to +your programs, too. + + When we speak of free software, we are referring to freedom, not +price. Our General Public Licenses are designed to make sure that you +have the freedom to distribute copies of free software (and charge for +this service if you wish), that you receive source code or can get it +if you want it, that you can change the software or use pieces of it +in new free programs; and that you know you can do these things. + + To protect your rights, we need to make restrictions that forbid +anyone to deny you these rights or to ask you to surrender the rights. +These restrictions translate to certain responsibilities for you if you +distribute copies of the software, or if you modify it. + + For example, if you distribute copies of such a program, whether +gratis or for a fee, you must give the recipients all the rights that +you have. You must make sure that they, too, receive or can get the +source code. And you must show them these terms so they know their +rights. + + We protect your rights with two steps: (1) copyright the software, and +(2) offer you this license which gives you legal permission to copy, +distribute and/or modify the software. + + Also, for each author's protection and ours, we want to make certain +that everyone understands that there is no warranty for this free +software. If the software is modified by someone else and passed on, we +want its recipients to know that what they have is not the original, so +that any problems introduced by others will not reflect on the original +authors' reputations. + + Finally, any free program is threatened constantly by software +patents. We wish to avoid the danger that redistributors of a free +program will individually obtain patent licenses, in effect making the +program proprietary. To prevent this, we have made it clear that any +patent must be licensed for everyone's free use or not licensed at all. + + The precise terms and conditions for copying, distribution and +modification follow. + + GNU GENERAL PUBLIC LICENSE + TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION + + 0. This License applies to any program or other work which contains +a notice placed by the copyright holder saying it may be distributed +under the terms of this General Public License. The "Program", below, +refers to any such program or work, and a "work based on the Program" +means either the Program or any derivative work under copyright law: +that is to say, a work containing the Program or a portion of it, +either verbatim or with modifications and/or translated into another +language. (Hereinafter, translation is included without limitation in +the term "modification".) Each licensee is addressed as "you". + +Activities other than copying, distribution and modification are not +covered by this License; they are outside its scope. The act of +running the Program is not restricted, and the output from the Program +is covered only if its contents constitute a work based on the +Program (independent of having been made by running the Program). +Whether that is true depends on what the Program does. + + 1. You may copy and distribute verbatim copies of the Program's +source code as you receive it, in any medium, provided that you +conspicuously and appropriately publish on each copy an appropriate +copyright notice and disclaimer of warranty; keep intact all the +notices that refer to this License and to the absence of any warranty; +and give any other recipients of the Program a copy of this License +along with the Program. + +You may charge a fee for the physical act of transferring a copy, and +you may at your option offer warranty protection in exchange for a fee. + + 2. You may modify your copy or copies of the Program or any portion +of it, thus forming a work based on the Program, and copy and +distribute such modifications or work under the terms of Section 1 +above, provided that you also meet all of these conditions: + + a) You must cause the modified files to carry prominent notices + stating that you changed the files and the date of any change. + + b) You must cause any work that you distribute or publish, that in + whole or in part contains or is derived from the Program or any + part thereof, to be licensed as a whole at no charge to all third + parties under the terms of this License. + + c) If the modified program normally reads commands interactively + when run, you must cause it, when started running for such + interactive use in the most ordinary way, to print or display an + announcement including an appropriate copyright notice and a + notice that there is no warranty (or else, saying that you provide + a warranty) and that users may redistribute the program under + these conditions, and telling the user how to view a copy of this + License. (Exception: if the Program itself is interactive but + does not normally print such an announcement, your work based on + the Program is not required to print an announcement.) + +These requirements apply to the modified work as a whole. If +identifiable sections of that work are not derived from the Program, +and can be reasonably considered independent and separate works in +themselves, then this License, and its terms, do not apply to those +sections when you distribute them as separate works. But when you +distribute the same sections as part of a whole which is a work based +on the Program, the distribution of the whole must be on the terms of +this License, whose permissions for other licensees extend to the +entire whole, and thus to each and every part regardless of who wrote it. + +Thus, it is not the intent of this section to claim rights or contest +your rights to work written entirely by you; rather, the intent is to +exercise the right to control the distribution of derivative or +collective works based on the Program. + +In addition, mere aggregation of another work not based on the Program +with the Program (or with a work based on the Program) on a volume of +a storage or distribution medium does not bring the other work under +the scope of this License. + + 3. You may copy and distribute the Program (or a work based on it, +under Section 2) in object code or executable form under the terms of +Sections 1 and 2 above provided that you also do one of the following: + + a) Accompany it with the complete corresponding machine-readable + source code, which must be distributed under the terms of Sections + 1 and 2 above on a medium customarily used for software interchange; or, + + b) Accompany it with a written offer, valid for at least three + years, to give any third party, for a charge no more than your + cost of physically performing source distribution, a complete + machine-readable copy of the corresponding source code, to be + distributed under the terms of Sections 1 and 2 above on a medium + customarily used for software interchange; or, + + c) Accompany it with the information you received as to the offer + to distribute corresponding source code. (This alternative is + allowed only for noncommercial distribution and only if you + received the program in object code or executable form with such + an offer, in accord with Subsection b above.) + +The source code for a work means the preferred form of the work for +making modifications to it. For an executable work, complete source +code means all the source code for all modules it contains, plus any +associated interface definition files, plus the scripts used to +control compilation and installation of the executable. However, as a +special exception, the source code distributed need not include +anything that is normally distributed (in either source or binary +form) with the major components (compiler, kernel, and so on) of the +operating system on which the executable runs, unless that component +itself accompanies the executable. + +If distribution of executable or object code is made by offering +access to copy from a designated place, then offering equivalent +access to copy the source code from the same place counts as +distribution of the source code, even though third parties are not +compelled to copy the source along with the object code. + + 4. You may not copy, modify, sublicense, or distribute the Program +except as expressly provided under this License. Any attempt +otherwise to copy, modify, sublicense or distribute the Program is +void, and will automatically terminate your rights under this License. +However, parties who have received copies, or rights, from you under +this License will not have their licenses terminated so long as such +parties remain in full compliance. + + 5. You are not required to accept this License, since you have not +signed it. However, nothing else grants you permission to modify or +distribute the Program or its derivative works. These actions are +prohibited by law if you do not accept this License. Therefore, by +modifying or distributing the Program (or any work based on the +Program), you indicate your acceptance of this License to do so, and +all its terms and conditions for copying, distributing or modifying +the Program or works based on it. + + 6. Each time you redistribute the Program (or any work based on the +Program), the recipient automatically receives a license from the +original licensor to copy, distribute or modify the Program subject to +these terms and conditions. You may not impose any further +restrictions on the recipients' exercise of the rights granted herein. +You are not responsible for enforcing compliance by third parties to +this License. + + 7. If, as a consequence of a court judgment or allegation of patent +infringement or for any other reason (not limited to patent issues), +conditions are imposed on you (whether by court order, agreement or +otherwise) that contradict the conditions of this License, they do not +excuse you from the conditions of this License. If you cannot +distribute so as to satisfy simultaneously your obligations under this +License and any other pertinent obligations, then as a consequence you +may not distribute the Program at all. For example, if a patent +license would not permit royalty-free redistribution of the Program by +all those who receive copies directly or indirectly through you, then +the only way you could satisfy both it and this License would be to +refrain entirely from distribution of the Program. + +If any portion of this section is held invalid or unenforceable under +any particular circumstance, the balance of the section is intended to +apply and the section as a whole is intended to apply in other +circumstances. + +It is not the purpose of this section to induce you to infringe any +patents or other property right claims or to contest validity of any +such claims; this section has the sole purpose of protecting the +integrity of the free software distribution system, which is +implemented by public license practices. Many people have made +generous contributions to the wide range of software distributed +through that system in reliance on consistent application of that +system; it is up to the author/donor to decide if he or she is willing +to distribute software through any other system and a licensee cannot +impose that choice. + +This section is intended to make thoroughly clear what is believed to +be a consequence of the rest of this License. + + 8. If the distribution and/or use of the Program is restricted in +certain countries either by patents or by copyrighted interfaces, the +original copyright holder who places the Program under this License +may add an explicit geographical distribution limitation excluding +those countries, so that distribution is permitted only in or among +countries not thus excluded. In such case, this License incorporates +the limitation as if written in the body of this License. + + 9. The Free Software Foundation may publish revised and/or new versions +of the General Public License from time to time. Such new versions will +be similar in spirit to the present version, but may differ in detail to +address new problems or concerns. + +Each version is given a distinguishing version number. If the Program +specifies a version number of this License which applies to it and "any +later version", you have the option of following the terms and conditions +either of that version or of any later version published by the Free +Software Foundation. If the Program does not specify a version number of +this License, you may choose any version ever published by the Free Software +Foundation. + + 10. If you wish to incorporate parts of the Program into other free +programs whose distribution conditions are different, write to the author +to ask for permission. For software which is copyrighted by the Free +Software Foundation, write to the Free Software Foundation; we sometimes +make exceptions for this. Our decision will be guided by the two goals +of preserving the free status of all derivatives of our free software and +of promoting the sharing and reuse of software generally. + + NO WARRANTY + + 11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY +FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN +OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES +PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED +OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF +MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS +TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE +PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING, +REPAIR OR CORRECTION. + + 12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING +WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR +REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, +INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING +OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED +TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY +YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER +PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE +POSSIBILITY OF SUCH DAMAGES. + + END OF TERMS AND CONDITIONS + + How to Apply These Terms to Your New Programs + + If you develop a new program, and you want it to be of the greatest +possible use to the public, the best way to achieve this is to make it +free software which everyone can redistribute and change under these terms. + + To do so, attach the following notices to the program. It is safest +to attach them to the start of each source file to most effectively +convey the exclusion of warranty; and each file should have at least +the "copyright" line and a pointer to where the full notice is found. + + + Copyright (C) + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License along + with this program; if not, write to the Free Software Foundation, Inc., + 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + +Also add information on how to contact you by electronic and paper mail. + +If the program is interactive, make it output a short notice like this +when it starts in an interactive mode: + + Gnomovision version 69, Copyright (C) year name of author + Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'. + This is free software, and you are welcome to redistribute it + under certain conditions; type `show c' for details. + +The hypothetical commands `show w' and `show c' should show the appropriate +parts of the General Public License. Of course, the commands you use may +be called something other than `show w' and `show c'; they could even be +mouse-clicks or menu items--whatever suits your program. + +You should also get your employer (if you work as a programmer) or your +school, if any, to sign a "copyright disclaimer" for the program, if +necessary. Here is a sample; alter the names: + + Yoyodyne, Inc., hereby disclaims all copyright interest in the program + `Gnomovision' (which makes passes at compilers) written by James Hacker. + + , 1 April 1989 + Ty Coon, President of Vice + +This General Public License does not permit incorporating your program into +proprietary programs. If your program is a subroutine library, you may +consider it more useful to permit linking proprietary applications with the +library. If this is what you want to do, use the GNU Lesser General +Public License instead of this License. diff --git a/view/theme/quattro/LiberationSans-Bold.ttf b/view/theme/quattro/LiberationSans-Bold.ttf new file mode 100644 index 000000000..169fac34d Binary files /dev/null and b/view/theme/quattro/LiberationSans-Bold.ttf differ diff --git a/view/theme/quattro/LiberationSans-Italic.ttf b/view/theme/quattro/LiberationSans-Italic.ttf new file mode 100644 index 000000000..8b9dc760a Binary files /dev/null and b/view/theme/quattro/LiberationSans-Italic.ttf differ diff --git a/view/theme/quattro/LiberationSans-Regular.ttf b/view/theme/quattro/LiberationSans-Regular.ttf new file mode 100644 index 000000000..ceeaa2740 Binary files /dev/null and b/view/theme/quattro/LiberationSans-Regular.ttf differ diff --git a/view/theme/quattro/liberation-fonts-ttf-1.07.0.tar.gz b/view/theme/quattro/liberation-fonts-ttf-1.07.0.tar.gz new file mode 100644 index 000000000..0c86f7347 Binary files /dev/null and b/view/theme/quattro/liberation-fonts-ttf-1.07.0.tar.gz differ diff --git a/view/theme/quattro/style.css b/view/theme/quattro/style.css new file mode 100644 index 000000000..055f8e9b6 --- /dev/null +++ b/view/theme/quattro/style.css @@ -0,0 +1,168 @@ +/** + * Fabio Comuni + **/ +/* fonts */ +@font-face { + font-family: "LiberationSans"; + src: local("Liberation Sans"), url(LiberationSans-Regular.ttf) format("truetype"); + font-weight: normal; + font-style: normal; +} +@font-face { + font-family: "LiberationSans"; + src: local("Liberation Sans"), url(LiberationSans-Bold.ttf) format("truetype"); + font-weight: bold; + font-style: normal; +} +@font-face { + font-family: "LiberationSans"; + src: local("Liberation Sans"), url(LiberationSans-Italic.ttf) format("truetype"); + font-weight: normal; + font-style: italic; +} +/* global */ +body { + font-family: LiberationSans, helvetica, arial, freesans, clean, sans-serif; + font-size: 12px; + background-color: #FFFFFF; + color: #2d2d2d; + margin: 0px; +} +a, a:visited, a:link { + color: #005c94; + text-decoration: none; +} +a:hover { + text-decoration: underline; +} +.left { + float: left; +} +.right { + float: right; +} +/* nav */ +nav { + width: 100%; + height: 50px; + background-color: #0e232e; + color: #FFFFFF; +} +nav a, +nav a:visited, +nav a:link, +nav a:hover { + color: #FFFFFF; + text-decoration: none; +} +nav #site-location { + font-size: 8px; + float: left; + background-color: #364e59; + padding: 1px 5px; + margin-left: 20px; + -moz-border-radius: 0 0 5px 5px; + -webkit-border-radius: 0 0 5px 5px; + border-radius: 0 0 5px 5px; +} +nav #nav { + clear: both; + padding: 0px 20px; + height: auto; + padding-top: 6px; +} +nav #nav .nav-menu-icon { + position: relative; + height: 22px; + padding: 5px; + margin: 0px 10px; + -moz-border-radius: 5px 5px 0 0; + -webkit-border-radius: 5px 5px 0 0; + border-radius: 5px 5px 0 0; +} +nav #nav .nav-menu-icon.selected { + background-color: #364e59; +} +nav #nav .nav-menu-icon img { + width: 22px; + height: 22px; +} +nav #nav .nav-menu { + position: relative; + height: 16px; + padding: 5px; + margin: 3px 15px 0px; + font-size: 14px; + border-bottom: 3px solid #0e232e; +} +nav #nav .nav-menu.selected { + border-bottom: 3px solid #9eabb0; +} +nav #nav .nav-menu .nav-notify { + position: absolute; + background-color: #19aeff; + -moz-border-radius: 5px 5px 5px 5px; + -webkit-border-radius: 5px 5px 5px 5px; + border-radius: 5px 5px 5px 5px; + font-size: 10px; + padding: 1px 3px; + top: 0px; + right: -10px; + min-width: 15px; + text-align: right; +} +ul.menu-popup { + position: absolute; + /*display: none;*/ + + width: auto; + background: #FFFFFF; + color: #2d2d2d; + margin: 0px; + padding: 0px; + list-style: none; + border: 3px solid #364e59; + z-index: 100000; +} +ul.menu-popup a { + display: block; + color: #2d2d2d; + padding: 5px 10px; +} +ul.menu-popup a:hover { + background-color: #bdcdd4; +} +ul.menu-popup .menu-sep { + border-top: 1px solid #9eabb0; +} +.left .menu-popup { + left: 0px; +} +.right .menu-popup { + right: 0px; +} +/* icons */ +.icon { + background-color: transparent ; + background-repeat: no-repeat; + background-position: center center; + display: block; +} +.icon.s22 { + width: 22px; + height: 22px; +} +.icon.s22.notify_off { + background-image: url("../../../images/icons/notify_off_22.png"); +} +.icon.s22.notify_on { + background-image: url("../../../images/icons/notify_on_22.png"); +} +/* aside */ +aside { + display: none; +} +/* section */ +section { + display: none; +} diff --git a/view/theme/quattro/style.less b/view/theme/quattro/style.less new file mode 100644 index 000000000..e267834a6 --- /dev/null +++ b/view/theme/quattro/style.less @@ -0,0 +1,193 @@ +/** + * Fabio Comuni + **/ +// Less file http://lesscss.org/ +// compile with lessc +// $ lessc style.less > style.css + +// "Echo" palette from Inkscape +@Blue1:rgb(25,174,255); +@Blue2:rgb(0,132,200); +@Blue3:rgb(0,92,148); +@Red1:rgb(255,65,65); +@Red2:rgb(220,0,0); +@Red3:rgb(181,0,0); +@Orange1:rgb(255,255,62); +@Orange2:rgb(255,153,0); +@Orange3:rgb(255,102,0); +@Brown1:rgb(255,192,34); +@Brown2:rgb(184,129,0); +@Brown3:rgb(128,77,0); +@Green1:rgb(204,255,66); +@Green2:rgb(154,222,0); +@Green3:rgb(0,145,0); +@Purple1:rgb(241,202,255); +@Purple2:rgb(215,108,255); +@Purple3:rgb(186,0,255); +@Metalic1:rgb(189,205,212); +@Metalic2:rgb(158,171,176); +@Metalic3:rgb(54,78,89); +@Metalic4:rgb(14,35,46); +@Grey1:rgb(255,255,255); +@Grey2:rgb(204,204,204); +@Grey3:rgb(153,153,153); +@Grey4:rgb(102,102,102); +@Grey5:rgb(45,45,45); + + + +/* fonts */ +@font-face { + font-family: "LiberationSans"; + src: local("Liberation Sans"), url( LiberationSans-Regular.ttf ) format("truetype"); + font-weight: normal; font-style: normal; +} +@font-face { + font-family: "LiberationSans"; + src: local("Liberation Sans"), url( LiberationSans-Bold.ttf ) format("truetype"); + font-weight: bold; font-style: normal; +} +@font-face { + font-family: "LiberationSans"; + src: local("Liberation Sans"), url( LiberationSans-Italic.ttf ) format("truetype"); + font-weight: normal; font-style: italic; +} + +/* global */ +body { + font-family: LiberationSans,helvetica,arial,freesans,clean,sans-serif; + font-size: 12px; + background-color: #FFFFFF; + color: @Grey5; + margin: 0px; +} + +.rounded(@tr: 5px, @tl: 5px, @bl: 5px, @br: 5px){ + -moz-border-radius: @arguments; + -webkit-border-radius: @arguments; + border-radius: @arguments; +} + +.roundbottom (@radius: 5px){ .rounded(0, 0, @radius, @radius); } +.roundtop (@radius: 5px){ .rounded(@radius, @radius, 0, 0); } + +a, a:visited, a:link { color: @Blue3; text-decoration: none; } +a:hover {text-decoration: underline; } + +.left { float: left; } +.right { float: right; } + +/* nav */ +nav { + width: 100%; height: 50px; + background-color: @Metalic4; + color: #FFFFFF; + a, a:visited, a:link, a:hover { color: #FFFFFF; text-decoration: none; } + + #site-location { + font-size:8px; + float:left; + background-color: @Metalic3; + padding: 1px 5px; + margin-left: 20px; + .roundbottom() + } + + #nav { + clear: both; + padding: 0px 20px; + height: auto; + padding-top: 6px; + + .nav-menu-icon { + position: relative; + height: 22px; + padding: 5px; + margin: 0px 10px; + .roundtop(); + + &.selected { + background-color: @Metalic3; + } + + img { width: 22px; height: 22px; } + } + + .nav-menu { + position: relative; + height: 16px; + padding: 5px; + margin: 3px 15px 0px; + font-size: 14px; + border-bottom: 3px solid @Metalic4; + &.selected { + border-bottom: 3px solid @Metalic2; + } + + .nav-notify { + position: absolute; + background-color: @Blue1; + .rounded(); + font-size: 10px; + padding: 1px 3px; + top: 0px; + right: -10px; + min-width: 15px; + text-align: right; + } + + } + + } +} + +ul.menu-popup { + position: absolute; + /*display: none;*/ + width: auto; + background: #FFFFFF; + color: @Grey5; + margin: 0px; + padding: 0px; + list-style: none; + border: 3px solid @Metalic3; + a { display: block; color: @Grey5; padding: 5px 10px;} + a:hover { background-color: @Metalic1; } + z-index: 100000; + + .menu-sep { + border-top: 1px solid @Metalic2; + } +} +.left .menu-popup{ left: 0px; } +.right .menu-popup{ right: 0px; } + +/* icons */ + + +.icons(@size: 22) { + &.notify_off { background-image: url("../../../images/icons/notify_off_@{size}.png"); } + &.notify_on { background-image: url("../../../images/icons/notify_on_@{size}.png"); } +} + + +.icon { + background-color: transparent ; + background-repeat: no-repeat; + background-position: center center; + display: block; + + &.s22 { + width:22px; height: 22px; + .icons(22); + } + +} + + + +/* aside */ +aside { display: none; } + +/* section */ +section { display: none;} -- cgit v1.2.3 From 5fb2b522f47a362debae7ee0c3bcb3b23f36bac6 Mon Sep 17 00:00:00 2001 From: Fabio Comuni Date: Mon, 25 Jul 2011 16:53:27 +0200 Subject: move
and {# -- cgit v1.2.3 From ba4ea589d00d8d79291191156a64e903b36509aa Mon Sep 17 00:00:00 2001 From: Fabio Comuni Date: Mon, 25 Jul 2011 16:55:43 +0200 Subject: update style --- view/theme/quattro/style.css | 166 ++++++++++++++++++++++--------------- view/theme/quattro/style.less | 187 +++++++++++++++++++++++++----------------- 2 files changed, 213 insertions(+), 140 deletions(-) (limited to 'view') diff --git a/view/theme/quattro/style.css b/view/theme/quattro/style.css index 055f8e9b6..ec5231290 100644 --- a/view/theme/quattro/style.css +++ b/view/theme/quattro/style.css @@ -2,27 +2,9 @@ * Fabio Comuni **/ /* fonts */ -@font-face { - font-family: "LiberationSans"; - src: local("Liberation Sans"), url(LiberationSans-Regular.ttf) format("truetype"); - font-weight: normal; - font-style: normal; -} -@font-face { - font-family: "LiberationSans"; - src: local("Liberation Sans"), url(LiberationSans-Bold.ttf) format("truetype"); - font-weight: bold; - font-style: normal; -} -@font-face { - font-family: "LiberationSans"; - src: local("Liberation Sans"), url(LiberationSans-Italic.ttf) format("truetype"); - font-weight: normal; - font-style: italic; -} /* global */ body { - font-family: LiberationSans, helvetica, arial, freesans, clean, sans-serif; + font-family: Liberation Sans, helvetica, arial, clean, sans-serif; font-size: 12px; background-color: #FFFFFF; color: #2d2d2d; @@ -41,37 +23,81 @@ a:hover { .right { float: right; } +/* icons */ +.icon { + background-color: transparent ; + background-repeat: no-repeat; + background-position: center center; + display: block; + overflow: hidden; + text-indent: -9999px; +} +.icon.s22 { + width: 22px; + height: 22px; + padding: 1px; +} +.icon.s22.notify { + background-image: url("../../../images/icons/notify_off_22.png"); +} +.icon.s22.gear { + background-image: url("../../../images/icons/gear_22.png"); +} +/* header */ +header { + position: fixed; + left: 0px; + top: 0px; + margin: 0px; + padding: 0px; + width: 100%; + height: 12px; + color: #FFFFFF; +} +header #site-location { + /*font-size:8px; + float:left; + background-color: @Metalic3; + padding: 1px 5px; + margin-left: 20px; + .roundbottom()*/ + + display: none; +} /* nav */ nav { width: 100%; - height: 50px; + height: 32px; + position: fixed; + left: 0px; + top: 0px; background-color: #0e232e; color: #FFFFFF; } nav a, +nav a:active, nav a:visited, nav a:link, nav a:hover { color: #FFFFFF; text-decoration: none; + outline: none; } -nav #site-location { - font-size: 8px; - float: left; - background-color: #364e59; - padding: 1px 5px; - margin-left: 20px; - -moz-border-radius: 0 0 5px 5px; - -webkit-border-radius: 0 0 5px 5px; - border-radius: 0 0 5px 5px; -} -nav #nav { - clear: both; +nav ul { + margin: 0px; padding: 0px 20px; - height: auto; - padding-top: 6px; } -nav #nav .nav-menu-icon { +nav ul li { + list-style: none; + margin: 0px; + padding: 0px; + float: left; +} +nav ul li .menu-popup { + left: 0px; + right: auto; +} +nav .nav-menu-icon { position: relative; height: 22px; padding: 5px; @@ -80,14 +106,17 @@ nav #nav .nav-menu-icon { -webkit-border-radius: 5px 5px 0 0; border-radius: 5px 5px 0 0; } -nav #nav .nav-menu-icon.selected { +nav .nav-menu-icon.selected { background-color: #364e59; } -nav #nav .nav-menu-icon img { +nav .nav-menu-icon img { width: 22px; height: 22px; } -nav #nav .nav-menu { +nav .nav-menu-icon .nav-notify { + top: 3px; +} +nav .nav-menu { position: relative; height: 16px; padding: 5px; @@ -95,10 +124,11 @@ nav #nav .nav-menu { font-size: 14px; border-bottom: 3px solid #0e232e; } -nav #nav .nav-menu.selected { +nav .nav-menu.selected { border-bottom: 3px solid #9eabb0; } -nav #nav .nav-menu .nav-notify { +nav .nav-notify { + display: none; position: absolute; background-color: #19aeff; -moz-border-radius: 5px 5px 5px 5px; @@ -111,10 +141,22 @@ nav #nav .nav-menu .nav-notify { min-width: 15px; text-align: right; } +nav .nav-notify.show { + display: block; +} +nav #nav-site-link { + float: right; +} +nav #nav-site-link .menu-popup { + right: 0px; + left: auto; +} +nav #nav-notifications-link.selected .icon.s22.notify { + background-image: url("../../../images/icons/notify_on_22.png"); +} ul.menu-popup { position: absolute; - /*display: none;*/ - + display: none; width: auto; background: #FFFFFF; color: #2d2d2d; @@ -135,34 +177,26 @@ ul.menu-popup a:hover { ul.menu-popup .menu-sep { border-top: 1px solid #9eabb0; } -.left .menu-popup { - left: 0px; -} -.right .menu-popup { - right: 0px; -} -/* icons */ -.icon { - background-color: transparent ; - background-repeat: no-repeat; - background-position: center center; +ul.menu-popup li { + float: none; + overflow: auto; + height: auto; display: block; } -.icon.s22 { - width: 22px; - height: 22px; +#nav-notifications-menu { + width: 400px; } -.icon.s22.notify_off { - background-image: url("../../../images/icons/notify_off_22.png"); +#nav-notifications-menu img { + float: left; + margin-right: 5px; } -.icon.s22.notify_on { - background-image: url("../../../images/icons/notify_on_22.png"); +#nav-notifications-menu .contactname { + font-weight: bold; } -/* aside */ -aside { - display: none; +#nav-notifications-menu .notif-when { + font-size: 10px; + color: #9eabb0; + display: block; } +/* aside */ /* section */ -section { - display: none; -} diff --git a/view/theme/quattro/style.less b/view/theme/quattro/style.less index e267834a6..53f833cfd 100644 --- a/view/theme/quattro/style.less +++ b/view/theme/quattro/style.less @@ -37,25 +37,27 @@ /* fonts */ -@font-face { - font-family: "LiberationSans"; - src: local("Liberation Sans"), url( LiberationSans-Regular.ttf ) format("truetype"); - font-weight: normal; font-style: normal; -} -@font-face { - font-family: "LiberationSans"; - src: local("Liberation Sans"), url( LiberationSans-Bold.ttf ) format("truetype"); - font-weight: bold; font-style: normal; -} -@font-face { - font-family: "LiberationSans"; - src: local("Liberation Sans"), url( LiberationSans-Italic.ttf ) format("truetype"); - font-weight: normal; font-style: italic; -} - +// @font-face { +// font-family: "LiberationSans"; +// src: local("Liberation Sans"),url( LiberationSans-Regular.ttf ) format("truetype"); +// font-weight: bold; font-style: italic; +// } +// +// @font-face { +// font-family: "LiberationSans"; +// src: local("Liberation Sans"),url( LiberationSans-Bold.ttf ) format("truetype"); +// font-weight: bold; font-style: normal; +// } +// @font-face { +// font-family: "LiberationSans"; +// src: local("Liberation Sans"),url( LiberationSans-Italic.ttf ) format("truetype"); +// font-weight: normal; font-style: italic; +// } + + /* global */ body { - font-family: LiberationSans,helvetica,arial,freesans,clean,sans-serif; + font-family: Liberation Sans,helvetica,arial,clean,sans-serif; font-size: 12px; background-color: #FFFFFF; color: @Grey5; @@ -77,28 +79,70 @@ a:hover {text-decoration: underline; } .left { float: left; } .right { float: right; } -/* nav */ -nav { - width: 100%; height: 50px; - background-color: @Metalic4; - color: #FFFFFF; - a, a:visited, a:link, a:hover { color: #FFFFFF; text-decoration: none; } +/* icons */ + + +.icons(@size: 22) { + &.notify { background-image: url("../../../images/icons/notify_off_@{size}.png"); } + &.gear { background-image: url("../../../images/icons/gear_@{size}.png"); } +} + + +.icon { + background-color: transparent ; + background-repeat: no-repeat; + background-position: center center; + display: block; + overflow: hidden; + text-indent: -9999px; + + &.s22 { + width:22px; height: 22px; + padding: 1px; + .icons(22); + } + +} + + +/* header */ +header { + position: fixed; left: 0px; top: 0px; + margin: 0px; padding: 0px; + width: 100%; height: 12px; + color: #FFFFFF; #site-location { - font-size:8px; + /*font-size:8px; float:left; background-color: @Metalic3; padding: 1px 5px; margin-left: 20px; - .roundbottom() + .roundbottom()*/ + display: none; } +} +/* nav */ +nav { + width: 100%; height: 32px; + position: fixed; left: 0px; top: 0px; + background-color: @Metalic4; + color: #FFFFFF; + + a, a:active, a:visited, a:link, a:hover { color: #FFFFFF; text-decoration: none; outline: none; } + + ul { + margin: 0px; + padding: 0px 20px; + li { + list-style: none; + margin: 0px; padding: 0px; + float: left; + .menu-popup{ left: 0px; right: auto; } + } + + } - #nav { - clear: both; - padding: 0px 20px; - height: auto; - padding-top: 6px; - .nav-menu-icon { position: relative; height: 22px; @@ -110,7 +154,8 @@ nav { background-color: @Metalic3; } - img { width: 22px; height: 22px; } + img { width: 22px; height: 22px; } + .nav-notify { top: 3px; } } .nav-menu { @@ -124,26 +169,37 @@ nav { border-bottom: 3px solid @Metalic2; } - .nav-notify { - position: absolute; - background-color: @Blue1; - .rounded(); - font-size: 10px; - padding: 1px 3px; - top: 0px; - right: -10px; - min-width: 15px; - text-align: right; - } + } + + .nav-notify { + display: none; + position: absolute; + background-color: @Blue1; + .rounded(); + font-size: 10px; + padding: 1px 3px; + top: 0px; + right: -10px; + min-width: 15px; + text-align: right; + &.show{ display: block; } } - } + + + #nav-site-link { + float: right; + .menu-popup{ right: 0px; left: auto; } + } + + #nav-notifications-link.selected .icon.s22.notify { background-image: url("../../../images/icons/notify_on_22.png") } + } ul.menu-popup { position: absolute; - /*display: none;*/ + display: none; width: auto; background: #FFFFFF; color: @Grey5; @@ -151,43 +207,26 @@ ul.menu-popup { padding: 0px; list-style: none; border: 3px solid @Metalic3; - a { display: block; color: @Grey5; padding: 5px 10px;} - a:hover { background-color: @Metalic1; } z-index: 100000; - - .menu-sep { - border-top: 1px solid @Metalic2; - } + + a { display: block; color: @Grey5; padding: 5px 10px;} + a:hover { background-color: @Metalic1; } + .menu-sep { border-top: 1px solid @Metalic2; } + li { float: none; overflow: auto; height: auto; display: block; } } -.left .menu-popup{ left: 0px; } -.right .menu-popup{ right: 0px; } - -/* icons */ - -.icons(@size: 22) { - &.notify_off { background-image: url("../../../images/icons/notify_off_@{size}.png"); } - &.notify_on { background-image: url("../../../images/icons/notify_on_@{size}.png"); } +#nav-notifications-menu { + width: 400px; + img { float: left; margin-right: 5px; } + .contactname { font-weight: bold; } + .notif-when { font-size: 10px; color: @Metalic2; display: block; } } -.icon { - background-color: transparent ; - background-repeat: no-repeat; - background-position: center center; - display: block; - - &.s22 { - width:22px; height: 22px; - .icons(22); - } - -} - /* aside */ -aside { display: none; } +// aside { display: none; } /* section */ -section { display: none;} +// section { display: none;} -- cgit v1.2.3 From 23d6339a4152759d8dcf68afc6e7dea652336d8c Mon Sep 17 00:00:00 2001 From: Fabio Comuni Date: Mon, 25 Jul 2011 17:12:42 +0200 Subject: change to some nav ids, notice in empty notifications popup --- view/nav.tpl | 7 ++++--- view/theme/quattro/style.css | 11 ++++++++--- view/theme/quattro/style.less | 10 ++++++++-- 3 files changed, 20 insertions(+), 8 deletions(-) (limited to 'view') diff --git a/view/nav.tpl b/view/nav.tpl index 454d7ebd0..5a8a904a6 100644 --- a/view/nav.tpl +++ b/view/nav.tpl @@ -5,7 +5,7 @@
- + {# diff --git a/view/theme/quattro/style.css b/view/theme/quattro/style.css index 9b4005037..ea0ed8eac 100644 --- a/view/theme/quattro/style.css +++ b/view/theme/quattro/style.css @@ -172,9 +172,17 @@ nav .nav-notify { nav .nav-notify.show { display: block; } +nav #nav-help-link, +nav #nav-search-link, +nav #nav-directory-link, +nav #nav-apps-link, nav #nav-site-linkmenu { float: right; } +nav #nav-help-link .menu-popup, +nav #nav-search-link .menu-popup, +nav #nav-directory-link .menu-popup, +nav #nav-apps-link .menu-popup, nav #nav-site-linkmenu .menu-popup { right: 0px; left: auto; diff --git a/view/theme/quattro/style.less b/view/theme/quattro/style.less index 1444ffdc1..5f3958f9d 100644 --- a/view/theme/quattro/style.less +++ b/view/theme/quattro/style.less @@ -205,7 +205,10 @@ nav { } - + #nav-help-link, + #nav-search-link, + #nav-directory-link, + #nav-apps-link, #nav-site-linkmenu { float: right; .menu-popup{ right: 0px; left: auto; } -- cgit v1.2.3 From 07b6c868b3a66efc2737dfc6459b4114fea59ba0 Mon Sep 17 00:00:00 2001 From: fabrixxm Date: Wed, 17 Aug 2011 18:36:24 +0200 Subject: remove javascript to set selectect nav item. enanche img template prefetch ignoring --- view/nav.tpl | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) (limited to 'view') diff --git a/view/nav.tpl b/view/nav.tpl index 0444ea75c..434c9f844 100644 --- a/view/nav.tpl +++ b/view/nav.tpl @@ -15,24 +15,25 @@ {{ if $nav.notifications }}
  • $nav.notifications.1
    • {{ endif }} {{ if $nav.messages }}
  • $nav.messages.1
    • {{ endif }} + {{ if $nav.contacts }}
  • $nav.contacts.1{{ endif }}
    • {{ endif }} {{ if $nav.community }} - {{ endif }} {{ if $nav.network }} - {{ endif }} - {{ if $nav.network }} - @@ -67,19 +68,19 @@ - - - {{ if $nav.apps }} - {{ endif }} @@ -122,7 +123,7 @@ {{ if $nav.settings }}$nav.settings.1{{ endif }} {{ if $nav.profiles }}$nav.profiles.1{{ endif }} -{{ if $nav.contacts }}$nav.contacts.1{{ endif }} + -- cgit v1.2.3 From d5567eb2976f903f7219f6b18a07ab79bca74dbd Mon Sep 17 00:00:00 2001 From: fabrixxm Date: Mon, 22 Aug 2011 14:06:55 +0200 Subject: compatiblity for old themes --- view/theme/clean/nav.tpl | 51 +++++++++++++++++++++++++++++++++++++++++ view/theme/darkness/nav.tpl | 51 +++++++++++++++++++++++++++++++++++++++++ view/theme/darkzero/nav.tpl | 51 +++++++++++++++++++++++++++++++++++++++++ view/theme/duepuntozero/nav.tpl | 51 +++++++++++++++++++++++++++++++++++++++++ view/theme/easterbunny/nav.tpl | 51 +++++++++++++++++++++++++++++++++++++++++ view/theme/goldenrod/nav.tpl | 51 +++++++++++++++++++++++++++++++++++++++++ view/theme/greenzero/nav.tpl | 51 +++++++++++++++++++++++++++++++++++++++++ view/theme/loozah/nav.tpl | 51 +++++++++++++++++++++++++++++++++++++++++ view/theme/purplezero/nav.tpl | 51 +++++++++++++++++++++++++++++++++++++++++ view/theme/shady/nav.tpl | 51 +++++++++++++++++++++++++++++++++++++++++ view/theme/three-d/nav.tpl | 51 +++++++++++++++++++++++++++++++++++++++++ 11 files changed, 561 insertions(+) create mode 100644 view/theme/clean/nav.tpl create mode 100644 view/theme/darkness/nav.tpl create mode 100644 view/theme/darkzero/nav.tpl create mode 100644 view/theme/duepuntozero/nav.tpl create mode 100644 view/theme/easterbunny/nav.tpl create mode 100644 view/theme/goldenrod/nav.tpl create mode 100644 view/theme/greenzero/nav.tpl create mode 100644 view/theme/loozah/nav.tpl create mode 100644 view/theme/purplezero/nav.tpl create mode 100644 view/theme/shady/nav.tpl create mode 100644 view/theme/three-d/nav.tpl (limited to 'view') diff --git a/view/theme/clean/nav.tpl b/view/theme/clean/nav.tpl new file mode 100644 index 000000000..2cd29a7c2 --- /dev/null +++ b/view/theme/clean/nav.tpl @@ -0,0 +1,51 @@ + diff --git a/view/theme/darkness/nav.tpl b/view/theme/darkness/nav.tpl new file mode 100644 index 000000000..2cd29a7c2 --- /dev/null +++ b/view/theme/darkness/nav.tpl @@ -0,0 +1,51 @@ + diff --git a/view/theme/darkzero/nav.tpl b/view/theme/darkzero/nav.tpl new file mode 100644 index 000000000..2cd29a7c2 --- /dev/null +++ b/view/theme/darkzero/nav.tpl @@ -0,0 +1,51 @@ + diff --git a/view/theme/duepuntozero/nav.tpl b/view/theme/duepuntozero/nav.tpl new file mode 100644 index 000000000..2cd29a7c2 --- /dev/null +++ b/view/theme/duepuntozero/nav.tpl @@ -0,0 +1,51 @@ + diff --git a/view/theme/easterbunny/nav.tpl b/view/theme/easterbunny/nav.tpl new file mode 100644 index 000000000..2cd29a7c2 --- /dev/null +++ b/view/theme/easterbunny/nav.tpl @@ -0,0 +1,51 @@ + diff --git a/view/theme/goldenrod/nav.tpl b/view/theme/goldenrod/nav.tpl new file mode 100644 index 000000000..2cd29a7c2 --- /dev/null +++ b/view/theme/goldenrod/nav.tpl @@ -0,0 +1,51 @@ + diff --git a/view/theme/greenzero/nav.tpl b/view/theme/greenzero/nav.tpl new file mode 100644 index 000000000..2cd29a7c2 --- /dev/null +++ b/view/theme/greenzero/nav.tpl @@ -0,0 +1,51 @@ + diff --git a/view/theme/loozah/nav.tpl b/view/theme/loozah/nav.tpl new file mode 100644 index 000000000..2cd29a7c2 --- /dev/null +++ b/view/theme/loozah/nav.tpl @@ -0,0 +1,51 @@ + diff --git a/view/theme/purplezero/nav.tpl b/view/theme/purplezero/nav.tpl new file mode 100644 index 000000000..2cd29a7c2 --- /dev/null +++ b/view/theme/purplezero/nav.tpl @@ -0,0 +1,51 @@ + diff --git a/view/theme/shady/nav.tpl b/view/theme/shady/nav.tpl new file mode 100644 index 000000000..2cd29a7c2 --- /dev/null +++ b/view/theme/shady/nav.tpl @@ -0,0 +1,51 @@ + diff --git a/view/theme/three-d/nav.tpl b/view/theme/three-d/nav.tpl new file mode 100644 index 000000000..2cd29a7c2 --- /dev/null +++ b/view/theme/three-d/nav.tpl @@ -0,0 +1,51 @@ + -- cgit v1.2.3 From 71d44d78ec5b16a53b82f4e631b86cd8247a9b0f Mon Sep 17 00:00:00 2001 From: Fabio Comuni Date: Wed, 31 Aug 2011 16:17:32 +0200 Subject: Installed apps as array instead of string --- view/apps.tpl | 7 +++++++ 1 file changed, 7 insertions(+) create mode 100644 view/apps.tpl (limited to 'view') diff --git a/view/apps.tpl b/view/apps.tpl new file mode 100644 index 000000000..61ea9ee5f --- /dev/null +++ b/view/apps.tpl @@ -0,0 +1,7 @@ +

    $title

    + +
      + {{ for $apps as $ap }} +
    • $ap.name
      • + {{ endfor }} +
    -- cgit v1.2.3 From 5ce6f893a64984eae9685db305b8d29ae3ced509 Mon Sep 17 00:00:00 2001 From: Fabio Comuni Date: Wed, 31 Aug 2011 16:18:03 +0200 Subject: Apps popup menu in navbar --- view/nav.tpl | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) (limited to 'view') diff --git a/view/nav.tpl b/view/nav.tpl index 434c9f844..cf1c2a227 100644 --- a/view/nav.tpl +++ b/view/nav.tpl @@ -81,7 +81,12 @@ {{ if $nav.apps }} {{ endif }} -- cgit v1.2.3 From 62295af1f2c3434fbf40aff6d29fd08859259ddf Mon Sep 17 00:00:00 2001 From: Fabio Comuni Date: Wed, 31 Aug 2011 16:19:17 +0200 Subject: quattro: cleanup and split of less files --- view/theme/quattro/LIBERATION-FONTS-COPYING | 339 --------------------- view/theme/quattro/LiberationSans-Bold.ttf | Bin 136664 -> 0 bytes view/theme/quattro/LiberationSans-Italic.ttf | Bin 161532 -> 0 bytes view/theme/quattro/LiberationSans-Regular.ttf | Bin 139036 -> 0 bytes view/theme/quattro/colors.less | 50 +++ view/theme/quattro/experimental | 0 .../quattro/liberation-fonts-ttf-1.07.0.tar.gz | Bin 1326750 -> 0 bytes view/theme/quattro/quattro.less | 212 +++++++++++++ view/theme/quattro/style.css | 17 +- view/theme/quattro/style.less | 260 +--------------- 10 files changed, 273 insertions(+), 605 deletions(-) delete mode 100644 view/theme/quattro/LIBERATION-FONTS-COPYING delete mode 100644 view/theme/quattro/LiberationSans-Bold.ttf delete mode 100644 view/theme/quattro/LiberationSans-Italic.ttf delete mode 100644 view/theme/quattro/LiberationSans-Regular.ttf create mode 100644 view/theme/quattro/colors.less create mode 100644 view/theme/quattro/experimental delete mode 100644 view/theme/quattro/liberation-fonts-ttf-1.07.0.tar.gz create mode 100644 view/theme/quattro/quattro.less (limited to 'view') diff --git a/view/theme/quattro/LIBERATION-FONTS-COPYING b/view/theme/quattro/LIBERATION-FONTS-COPYING deleted file mode 100644 index d511905c1..000000000 --- a/view/theme/quattro/LIBERATION-FONTS-COPYING +++ /dev/null @@ -1,339 +0,0 @@ - GNU GENERAL PUBLIC LICENSE - Version 2, June 1991 - - Copyright (C) 1989, 1991 Free Software Foundation, Inc., - 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA - Everyone is permitted to copy and distribute verbatim copies - of this license document, but changing it is not allowed. - - Preamble - - The licenses for most software are designed to take away your -freedom to share and change it. By contrast, the GNU General Public -License is intended to guarantee your freedom to share and change free -software--to make sure the software is free for all its users. This -General Public License applies to most of the Free Software -Foundation's software and to any other program whose authors commit to -using it. (Some other Free Software Foundation software is covered by -the GNU Lesser General Public License instead.) You can apply it to -your programs, too. - - When we speak of free software, we are referring to freedom, not -price. Our General Public Licenses are designed to make sure that you -have the freedom to distribute copies of free software (and charge for -this service if you wish), that you receive source code or can get it -if you want it, that you can change the software or use pieces of it -in new free programs; and that you know you can do these things. - - To protect your rights, we need to make restrictions that forbid -anyone to deny you these rights or to ask you to surrender the rights. -These restrictions translate to certain responsibilities for you if you -distribute copies of the software, or if you modify it. - - For example, if you distribute copies of such a program, whether -gratis or for a fee, you must give the recipients all the rights that -you have. You must make sure that they, too, receive or can get the -source code. And you must show them these terms so they know their -rights. - - We protect your rights with two steps: (1) copyright the software, and -(2) offer you this license which gives you legal permission to copy, -distribute and/or modify the software. - - Also, for each author's protection and ours, we want to make certain -that everyone understands that there is no warranty for this free -software. If the software is modified by someone else and passed on, we -want its recipients to know that what they have is not the original, so -that any problems introduced by others will not reflect on the original -authors' reputations. - - Finally, any free program is threatened constantly by software -patents. We wish to avoid the danger that redistributors of a free -program will individually obtain patent licenses, in effect making the -program proprietary. To prevent this, we have made it clear that any -patent must be licensed for everyone's free use or not licensed at all. - - The precise terms and conditions for copying, distribution and -modification follow. - - GNU GENERAL PUBLIC LICENSE - TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION - - 0. This License applies to any program or other work which contains -a notice placed by the copyright holder saying it may be distributed -under the terms of this General Public License. The "Program", below, -refers to any such program or work, and a "work based on the Program" -means either the Program or any derivative work under copyright law: -that is to say, a work containing the Program or a portion of it, -either verbatim or with modifications and/or translated into another -language. (Hereinafter, translation is included without limitation in -the term "modification".) Each licensee is addressed as "you". - -Activities other than copying, distribution and modification are not -covered by this License; they are outside its scope. The act of -running the Program is not restricted, and the output from the Program -is covered only if its contents constitute a work based on the -Program (independent of having been made by running the Program). -Whether that is true depends on what the Program does. - - 1. You may copy and distribute verbatim copies of the Program's -source code as you receive it, in any medium, provided that you -conspicuously and appropriately publish on each copy an appropriate -copyright notice and disclaimer of warranty; keep intact all the -notices that refer to this License and to the absence of any warranty; -and give any other recipients of the Program a copy of this License -along with the Program. - -You may charge a fee for the physical act of transferring a copy, and -you may at your option offer warranty protection in exchange for a fee. - - 2. You may modify your copy or copies of the Program or any portion -of it, thus forming a work based on the Program, and copy and -distribute such modifications or work under the terms of Section 1 -above, provided that you also meet all of these conditions: - - a) You must cause the modified files to carry prominent notices - stating that you changed the files and the date of any change. - - b) You must cause any work that you distribute or publish, that in - whole or in part contains or is derived from the Program or any - part thereof, to be licensed as a whole at no charge to all third - parties under the terms of this License. - - c) If the modified program normally reads commands interactively - when run, you must cause it, when started running for such - interactive use in the most ordinary way, to print or display an - announcement including an appropriate copyright notice and a - notice that there is no warranty (or else, saying that you provide - a warranty) and that users may redistribute the program under - these conditions, and telling the user how to view a copy of this - License. (Exception: if the Program itself is interactive but - does not normally print such an announcement, your work based on - the Program is not required to print an announcement.) - -These requirements apply to the modified work as a whole. If -identifiable sections of that work are not derived from the Program, -and can be reasonably considered independent and separate works in -themselves, then this License, and its terms, do not apply to those -sections when you distribute them as separate works. But when you -distribute the same sections as part of a whole which is a work based -on the Program, the distribution of the whole must be on the terms of -this License, whose permissions for other licensees extend to the -entire whole, and thus to each and every part regardless of who wrote it. - -Thus, it is not the intent of this section to claim rights or contest -your rights to work written entirely by you; rather, the intent is to -exercise the right to control the distribution of derivative or -collective works based on the Program. - -In addition, mere aggregation of another work not based on the Program -with the Program (or with a work based on the Program) on a volume of -a storage or distribution medium does not bring the other work under -the scope of this License. - - 3. You may copy and distribute the Program (or a work based on it, -under Section 2) in object code or executable form under the terms of -Sections 1 and 2 above provided that you also do one of the following: - - a) Accompany it with the complete corresponding machine-readable - source code, which must be distributed under the terms of Sections - 1 and 2 above on a medium customarily used for software interchange; or, - - b) Accompany it with a written offer, valid for at least three - years, to give any third party, for a charge no more than your - cost of physically performing source distribution, a complete - machine-readable copy of the corresponding source code, to be - distributed under the terms of Sections 1 and 2 above on a medium - customarily used for software interchange; or, - - c) Accompany it with the information you received as to the offer - to distribute corresponding source code. (This alternative is - allowed only for noncommercial distribution and only if you - received the program in object code or executable form with such - an offer, in accord with Subsection b above.) - -The source code for a work means the preferred form of the work for -making modifications to it. For an executable work, complete source -code means all the source code for all modules it contains, plus any -associated interface definition files, plus the scripts used to -control compilation and installation of the executable. However, as a -special exception, the source code distributed need not include -anything that is normally distributed (in either source or binary -form) with the major components (compiler, kernel, and so on) of the -operating system on which the executable runs, unless that component -itself accompanies the executable. - -If distribution of executable or object code is made by offering -access to copy from a designated place, then offering equivalent -access to copy the source code from the same place counts as -distribution of the source code, even though third parties are not -compelled to copy the source along with the object code. - - 4. You may not copy, modify, sublicense, or distribute the Program -except as expressly provided under this License. Any attempt -otherwise to copy, modify, sublicense or distribute the Program is -void, and will automatically terminate your rights under this License. -However, parties who have received copies, or rights, from you under -this License will not have their licenses terminated so long as such -parties remain in full compliance. - - 5. You are not required to accept this License, since you have not -signed it. However, nothing else grants you permission to modify or -distribute the Program or its derivative works. These actions are -prohibited by law if you do not accept this License. Therefore, by -modifying or distributing the Program (or any work based on the -Program), you indicate your acceptance of this License to do so, and -all its terms and conditions for copying, distributing or modifying -the Program or works based on it. - - 6. Each time you redistribute the Program (or any work based on the -Program), the recipient automatically receives a license from the -original licensor to copy, distribute or modify the Program subject to -these terms and conditions. You may not impose any further -restrictions on the recipients' exercise of the rights granted herein. -You are not responsible for enforcing compliance by third parties to -this License. - - 7. If, as a consequence of a court judgment or allegation of patent -infringement or for any other reason (not limited to patent issues), -conditions are imposed on you (whether by court order, agreement or -otherwise) that contradict the conditions of this License, they do not -excuse you from the conditions of this License. If you cannot -distribute so as to satisfy simultaneously your obligations under this -License and any other pertinent obligations, then as a consequence you -may not distribute the Program at all. For example, if a patent -license would not permit royalty-free redistribution of the Program by -all those who receive copies directly or indirectly through you, then -the only way you could satisfy both it and this License would be to -refrain entirely from distribution of the Program. - -If any portion of this section is held invalid or unenforceable under -any particular circumstance, the balance of the section is intended to -apply and the section as a whole is intended to apply in other -circumstances. - -It is not the purpose of this section to induce you to infringe any -patents or other property right claims or to contest validity of any -such claims; this section has the sole purpose of protecting the -integrity of the free software distribution system, which is -implemented by public license practices. Many people have made -generous contributions to the wide range of software distributed -through that system in reliance on consistent application of that -system; it is up to the author/donor to decide if he or she is willing -to distribute software through any other system and a licensee cannot -impose that choice. - -This section is intended to make thoroughly clear what is believed to -be a consequence of the rest of this License. - - 8. If the distribution and/or use of the Program is restricted in -certain countries either by patents or by copyrighted interfaces, the -original copyright holder who places the Program under this License -may add an explicit geographical distribution limitation excluding -those countries, so that distribution is permitted only in or among -countries not thus excluded. In such case, this License incorporates -the limitation as if written in the body of this License. - - 9. The Free Software Foundation may publish revised and/or new versions -of the General Public License from time to time. Such new versions will -be similar in spirit to the present version, but may differ in detail to -address new problems or concerns. - -Each version is given a distinguishing version number. If the Program -specifies a version number of this License which applies to it and "any -later version", you have the option of following the terms and conditions -either of that version or of any later version published by the Free -Software Foundation. If the Program does not specify a version number of -this License, you may choose any version ever published by the Free Software -Foundation. - - 10. If you wish to incorporate parts of the Program into other free -programs whose distribution conditions are different, write to the author -to ask for permission. For software which is copyrighted by the Free -Software Foundation, write to the Free Software Foundation; we sometimes -make exceptions for this. Our decision will be guided by the two goals -of preserving the free status of all derivatives of our free software and -of promoting the sharing and reuse of software generally. - - NO WARRANTY - - 11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY -FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN -OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES -PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED -OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF -MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS -TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE -PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING, -REPAIR OR CORRECTION. - - 12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING -WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR -REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, -INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING -OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED -TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY -YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER -PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE -POSSIBILITY OF SUCH DAMAGES. - - END OF TERMS AND CONDITIONS - - How to Apply These Terms to Your New Programs - - If you develop a new program, and you want it to be of the greatest -possible use to the public, the best way to achieve this is to make it -free software which everyone can redistribute and change under these terms. - - To do so, attach the following notices to the program. It is safest -to attach them to the start of each source file to most effectively -convey the exclusion of warranty; and each file should have at least -the "copyright" line and a pointer to where the full notice is found. - - - Copyright (C) - - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 2 of the License, or - (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License along - with this program; if not, write to the Free Software Foundation, Inc., - 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. - -Also add information on how to contact you by electronic and paper mail. - -If the program is interactive, make it output a short notice like this -when it starts in an interactive mode: - - Gnomovision version 69, Copyright (C) year name of author - Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'. - This is free software, and you are welcome to redistribute it - under certain conditions; type `show c' for details. - -The hypothetical commands `show w' and `show c' should show the appropriate -parts of the General Public License. Of course, the commands you use may -be called something other than `show w' and `show c'; they could even be -mouse-clicks or menu items--whatever suits your program. - -You should also get your employer (if you work as a programmer) or your -school, if any, to sign a "copyright disclaimer" for the program, if -necessary. Here is a sample; alter the names: - - Yoyodyne, Inc., hereby disclaims all copyright interest in the program - `Gnomovision' (which makes passes at compilers) written by James Hacker. - - , 1 April 1989 - Ty Coon, President of Vice - -This General Public License does not permit incorporating your program into -proprietary programs. If your program is a subroutine library, you may -consider it more useful to permit linking proprietary applications with the -library. If this is what you want to do, use the GNU Lesser General -Public License instead of this License. diff --git a/view/theme/quattro/LiberationSans-Bold.ttf b/view/theme/quattro/LiberationSans-Bold.ttf deleted file mode 100644 index 169fac34d..000000000 Binary files a/view/theme/quattro/LiberationSans-Bold.ttf and /dev/null differ diff --git a/view/theme/quattro/LiberationSans-Italic.ttf b/view/theme/quattro/LiberationSans-Italic.ttf deleted file mode 100644 index 8b9dc760a..000000000 Binary files a/view/theme/quattro/LiberationSans-Italic.ttf and /dev/null differ diff --git a/view/theme/quattro/LiberationSans-Regular.ttf b/view/theme/quattro/LiberationSans-Regular.ttf deleted file mode 100644 index ceeaa2740..000000000 Binary files a/view/theme/quattro/LiberationSans-Regular.ttf and /dev/null differ diff --git a/view/theme/quattro/colors.less b/view/theme/quattro/colors.less new file mode 100644 index 000000000..75a53a68a --- /dev/null +++ b/view/theme/quattro/colors.less @@ -0,0 +1,50 @@ +// Quattro Theme LESS file + +// "Echo" palette from Inkscape +@Blue1:rgb(25,174,255); +@Blue2:rgb(0,132,200); +@Blue3:rgb(0,92,148); +@Red1:rgb(255,65,65); +@Red2:rgb(220,0,0); +@Red3:rgb(181,0,0); +@Orange1:rgb(255,255,62); +@Orange2:rgb(255,153,0); +@Orange3:rgb(255,102,0); +@Brown1:rgb(255,192,34); +@Brown2:rgb(184,129,0); +@Brown3:rgb(128,77,0); +@Green1:rgb(204,255,66); +@Green2:rgb(154,222,0); +@Green3:rgb(0,145,0); +@Purple1:rgb(241,202,255); +@Purple2:rgb(215,108,255); +@Purple3:rgb(186,0,255); +@Metalic1:rgb(189,205,212); +@Metalic2:rgb(158,171,176); +@Metalic3:rgb(54,78,89); +@Metalic4:rgb(14,35,46); +@Grey1:rgb(255,255,255); +@Grey2:rgb(204,204,204); +@Grey3:rgb(153,153,153); +@Grey4:rgb(102,102,102); +@Grey5:rgb(45,45,45); + + +// Theme colors +@BodyBackground: @Grey1; +@BodyColor: @Grey5; + +@Link: @Blue3; +@LinkHover: @Blue3; +@LinkVisited: @Blue3; + +@Banner: @Grey1; + +@NavbarBackground:@Metalic4; +@NavbarSelectedBg:@Metalic3; +@NavbarSelectedBorder: @Metalic2; +@NavbarNotifBg: @Blue1; +@Menu: @Grey5; +@MenuBg: @Grey1; +@MenuBorder: @Metalic3; + diff --git a/view/theme/quattro/experimental b/view/theme/quattro/experimental new file mode 100644 index 000000000..e69de29bb diff --git a/view/theme/quattro/liberation-fonts-ttf-1.07.0.tar.gz b/view/theme/quattro/liberation-fonts-ttf-1.07.0.tar.gz deleted file mode 100644 index 0c86f7347..000000000 Binary files a/view/theme/quattro/liberation-fonts-ttf-1.07.0.tar.gz and /dev/null differ diff --git a/view/theme/quattro/quattro.less b/view/theme/quattro/quattro.less new file mode 100644 index 000000000..4c4a002f3 --- /dev/null +++ b/view/theme/quattro/quattro.less @@ -0,0 +1,212 @@ +// Quattro Theme LESS file + +/* global */ +body { + font-family: Liberation Sans,helvetica,arial,clean,sans-serif; + font-size: 12px; + background-color: @BodyBackground; + color: @BodyColor; + margin: 0px; + display:table-row; +} + +.shadow(@x: 0px, @y: 5px){ + -webkit-box-shadow:@x @y 10px rgba(0, 0, 0, 0.7); + -moz-box-shadow:@x @y 10px rgba(0, 0, 0, 0.7); + box-shadow:@x @y 10px rgba(0, 0, 0, 0.7); +} + +.rounded(@tr: 5px, @tl: 5px, @bl: 5px, @br: 5px){ + -moz-border-radius: @arguments; + -webkit-border-radius: @arguments; + border-radius: @arguments; +} + +.roundbottom (@radius: 5px){ .rounded(0, 0, @radius, @radius); } +.roundtop (@radius: 5px){ .rounded(@radius, @radius, 0, 0); } + +a, a:link { color: @Link; text-decoration: none; } +a:visited { color: @LinkVisited; text-decoration: none; } +a:hover {color: @LinkHover; text-decoration: underline; } + +.left { float: left; } +.right { float: right; } + +/* icons */ + + +.icons(@size: 22) { + &.notify { background-image: url("../../../images/icons/notify_off_@{size}.png"); } + &.gear { background-image: url("../../../images/icons/gear_@{size}.png"); } +} + + +.icon { + background-color: transparent ; + background-repeat: no-repeat; + background-position: center center; + display: block; + overflow: hidden; + text-indent: -9999px; + + &.s22 { + width:22px; height: 22px; + padding: 1px; + .icons(22); + } + +} + + + +/* header */ +header { + position: fixed; left: 43%; right: 43%; top: 0px; + margin: 0px; padding: 0px; + /*width: 100%; height: 12px; */ + z-index: 110; + color: @Grey1; + #site-location { + display: none; + } + + #banner { + + text-align: center; + width: 100%; + a, a:active, a:visited, a:link, a:hover { color: @Grey1; text-decoration: none; outline: none; vertical-align: bottom; } + #logo-img { height: 22px; margin-top:5px;} + #logo-text { font-size: 22px } + } +} +/* nav */ +nav { + width: 100%; height: 32px; + position: fixed; left: 0px; top: 0px; + padding: 0px; + background-color: @NavbarBackground; + color: @Grey1; + z-index: 100; + .shadow(0px, 0px); + + a, a:active, a:visited, a:link, a:hover { color: @Banner; text-decoration: none; outline: none; } + + ul { + margin: 0px; + padding: 0px 20px; + li { + list-style: none; + margin: 0px; padding: 0px; + float: left; + .menu-popup{ left: 0px; right: auto; } + } + + } + + .nav-menu-icon { + position: relative; + height: 22px; + padding: 5px; + margin: 0px 10px; + .roundtop(); + + &.selected { + background-color: @NavbarSelectedBg; + } + + img { width: 22px; height: 22px; } + .nav-notify { top: 3px; } + } + + .nav-menu { + position: relative; + height: 16px; + padding: 5px; + margin: 3px 15px 0px; + font-size: 14px; + border-bottom: 3px solid @NavbarBackground; + &.selected { + border-bottom: 3px solid @NavbarSelectedBorder; + } + + } + + .nav-notify { + display: none; + position: absolute; + background-color: @NavbarNotifBg; + .rounded(); + font-size: 10px; + padding: 1px 3px; + top: 0px; + right: -10px; + min-width: 15px; + text-align: right; + + &.show{ display: block; } + } + + + #nav-help-link, + #nav-search-link, + #nav-directory-link, + #nav-apps-link, + #nav-site-linkmenu { + float: right; + .menu-popup{ right: 0px; left: auto; } + } + + #nav-notifications-linkmenu.selected .icon.s22.notify { background-image: url("../../../images/icons/notify_on_22.png") } + #nav-apps-link.selected { background-color: @NavbarSelectedBg; } +} + + +ul.menu-popup { + position: absolute; + display: none; + width: 10em; + background: @MenuBg; + color: @Menu; + margin: 0px; + padding: 0px; + list-style: none; + border: 3px solid @MenuBorder; + z-index: 100000; + + .shadow(); + + a { display: block; color: @Grey5; padding: 5px 10px;} + a:hover { background-color: @Metalic1; } + .menu-sep { border-top: 1px solid @Metalic2; } + li { float: none; overflow: auto; height: auto; display: block; } + + .empty { + padding: 5px; + text-align: center; + color: @Metalic2; + } +} + +#nav-notifications-menu { + width: 400px; + img { float: left; margin-right: 5px; } + .contactname { font-weight: bold; } + .notif-when { font-size: 10px; color: @Metalic2; display: block; } +} + + + + +/* aside */ +aside { + display: table-cell; + width: 200px; + padding:50px 10px 0px 20px; +} + +/* section */ +section { + display: table-cell; + width: 800px; + padding:50px 20px 0px 10px; +} diff --git a/view/theme/quattro/style.css b/view/theme/quattro/style.css index ea0ed8eac..e2c06125b 100644 --- a/view/theme/quattro/style.css +++ b/view/theme/quattro/style.css @@ -10,11 +10,16 @@ body { margin: 0px; display: table-row; } -a, a:visited, a:link { +a, a:link { + color: #005c94; + text-decoration: none; +} +a:visited { color: #005c94; text-decoration: none; } a:hover { + color: #005c94; text-decoration: underline; } .left { @@ -57,13 +62,6 @@ header { color: #ffffff; } header #site-location { - /*font-size:8px; - float:left; - background-color: @Metalic3; - padding: 1px 5px; - margin-left: 20px; - .roundbottom()*/ - display: none; } header #banner { @@ -190,6 +188,9 @@ nav #nav-site-linkmenu .menu-popup { nav #nav-notifications-linkmenu.selected .icon.s22.notify { background-image: url("../../../images/icons/notify_on_22.png"); } +nav #nav-apps-link.selected { + background-color: #364e59; +} ul.menu-popup { position: absolute; display: none; diff --git a/view/theme/quattro/style.less b/view/theme/quattro/style.less index 5f3958f9d..d1c677b22 100644 --- a/view/theme/quattro/style.less +++ b/view/theme/quattro/style.less @@ -5,265 +5,9 @@ // compile with lessc // $ lessc style.less > style.css -// "Echo" palette from Inkscape -@Blue1:rgb(25,174,255); -@Blue2:rgb(0,132,200); -@Blue3:rgb(0,92,148); -@Red1:rgb(255,65,65); -@Red2:rgb(220,0,0); -@Red3:rgb(181,0,0); -@Orange1:rgb(255,255,62); -@Orange2:rgb(255,153,0); -@Orange3:rgb(255,102,0); -@Brown1:rgb(255,192,34); -@Brown2:rgb(184,129,0); -@Brown3:rgb(128,77,0); -@Green1:rgb(204,255,66); -@Green2:rgb(154,222,0); -@Green3:rgb(0,145,0); -@Purple1:rgb(241,202,255); -@Purple2:rgb(215,108,255); -@Purple3:rgb(186,0,255); -@Metalic1:rgb(189,205,212); -@Metalic2:rgb(158,171,176); -@Metalic3:rgb(54,78,89); -@Metalic4:rgb(14,35,46); -@Grey1:rgb(255,255,255); -@Grey2:rgb(204,204,204); -@Grey3:rgb(153,153,153); -@Grey4:rgb(102,102,102); -@Grey5:rgb(45,45,45); +@import "colors"; +@import "quattro"; -///* fonts */ -// @font-face { -// font-family: "LiberationSans"; -// src: local("Liberation Sans"),url( LiberationSans-Regular.ttf ) format("truetype"); -// font-weight: bold; font-style: italic; -// } -// -// @font-face { -// font-family: "LiberationSans"; -// src: local("Liberation Sans"),url( LiberationSans-Bold.ttf ) format("truetype"); -// font-weight: bold; font-style: normal; -// } -// @font-face { -// font-family: "LiberationSans"; -// src: local("Liberation Sans"),url( LiberationSans-Italic.ttf ) format("truetype"); -// font-weight: normal; font-style: italic; -// } -/* global */ -body { - font-family: Liberation Sans,helvetica,arial,clean,sans-serif; - font-size: 12px; - background-color: @Grey1; - color: @Grey5; - margin: 0px; - display:table-row; -} -.shadow(@x: 0px, @y: 5px){ - -webkit-box-shadow:@x @y 10px rgba(0, 0, 0, 0.7); - -moz-box-shadow:@x @y 10px rgba(0, 0, 0, 0.7); - box-shadow:@x @y 10px rgba(0, 0, 0, 0.7); -} - -.rounded(@tr: 5px, @tl: 5px, @bl: 5px, @br: 5px){ - -moz-border-radius: @arguments; - -webkit-border-radius: @arguments; - border-radius: @arguments; -} - -.roundbottom (@radius: 5px){ .rounded(0, 0, @radius, @radius); } -.roundtop (@radius: 5px){ .rounded(@radius, @radius, 0, 0); } - -a, a:visited, a:link { color: @Blue3; text-decoration: none; } -a:hover {text-decoration: underline; } - -.left { float: left; } -.right { float: right; } - -/* icons */ - - -.icons(@size: 22) { - &.notify { background-image: url("../../../images/icons/notify_off_@{size}.png"); } - &.gear { background-image: url("../../../images/icons/gear_@{size}.png"); } -} - - -.icon { - background-color: transparent ; - background-repeat: no-repeat; - background-position: center center; - display: block; - overflow: hidden; - text-indent: -9999px; - - &.s22 { - width:22px; height: 22px; - padding: 1px; - .icons(22); - } - -} - - - -/* header */ -header { - position: fixed; left: 43%; right: 43%; top: 0px; - margin: 0px; padding: 0px; - /*width: 100%; height: 12px; */ - z-index: 110; - color: @Grey1; - #site-location { - /*font-size:8px; - float:left; - background-color: @Metalic3; - padding: 1px 5px; - margin-left: 20px; - .roundbottom()*/ - display: none; - } - - #banner { - - text-align: center; - width: 100%; - a, a:active, a:visited, a:link, a:hover { color: @Grey1; text-decoration: none; outline: none; vertical-align: bottom; } - #logo-img { height: 22px; margin-top:5px;} - #logo-text { font-size: 22px } - } -} -/* nav */ -nav { - width: 100%; height: 32px; - position: fixed; left: 0px; top: 0px; - padding: 0px; - background-color: @Metalic4; - color: @Grey1; - z-index: 100; - .shadow(0px, 0px); - - a, a:active, a:visited, a:link, a:hover { color: @Grey1; text-decoration: none; outline: none; } - - ul { - margin: 0px; - padding: 0px 20px; - li { - list-style: none; - margin: 0px; padding: 0px; - float: left; - .menu-popup{ left: 0px; right: auto; } - } - - } - - .nav-menu-icon { - position: relative; - height: 22px; - padding: 5px; - margin: 0px 10px; - .roundtop(); - - &.selected { - background-color: @Metalic3; - } - - img { width: 22px; height: 22px; } - .nav-notify { top: 3px; } - } - - .nav-menu { - position: relative; - height: 16px; - padding: 5px; - margin: 3px 15px 0px; - font-size: 14px; - border-bottom: 3px solid @Metalic4; - &.selected { - border-bottom: 3px solid @Metalic2; - } - - } - - .nav-notify { - display: none; - position: absolute; - background-color: @Blue1; - .rounded(); - font-size: 10px; - padding: 1px 3px; - top: 0px; - right: -10px; - min-width: 15px; - text-align: right; - - &.show{ display: block; } - } - - - #nav-help-link, - #nav-search-link, - #nav-directory-link, - #nav-apps-link, - #nav-site-linkmenu { - float: right; - .menu-popup{ right: 0px; left: auto; } - } - - #nav-notifications-linkmenu.selected .icon.s22.notify { background-image: url("../../../images/icons/notify_on_22.png") } - -} - -ul.menu-popup { - position: absolute; - display: none; - width: 10em; - background: @Grey1; - color: @Grey5; - margin: 0px; - padding: 0px; - list-style: none; - border: 3px solid @Metalic3; - z-index: 100000; - - .shadow(); - - a { display: block; color: @Grey5; padding: 5px 10px;} - a:hover { background-color: @Metalic1; } - .menu-sep { border-top: 1px solid @Metalic2; } - li { float: none; overflow: auto; height: auto; display: block; } - - .empty { - padding: 5px; - text-align: center; - color: @Metalic2; - } -} - -#nav-notifications-menu { - width: 400px; - img { float: left; margin-right: 5px; } - .contactname { font-weight: bold; } - .notif-when { font-size: 10px; color: @Metalic2; display: block; } -} - - - - -/* aside */ -aside { - display: table-cell; - width: 200px; - padding:50px 10px 0px 20px; -} - -/* section */ -section { - display: table-cell; - width: 800px; - padding:50px 20px 0px 10px; -} -- cgit v1.2.3 From 54f0685a038d87706ec4ecc15edc55ee171b6079 Mon Sep 17 00:00:00 2001 From: Fabio Comuni Date: Wed, 31 Aug 2011 17:30:48 +0200 Subject: quattro: more colors --- view/theme/quattro/colors.less | 10 ++++++++++ view/theme/quattro/quattro.less | 19 ++++++++++--------- view/theme/quattro/style.css | 9 +++++---- 3 files changed, 25 insertions(+), 13 deletions(-) (limited to 'view') diff --git a/view/theme/quattro/colors.less b/view/theme/quattro/colors.less index 75a53a68a..d79dbca68 100644 --- a/view/theme/quattro/colors.less +++ b/view/theme/quattro/colors.less @@ -44,7 +44,17 @@ @NavbarSelectedBg:@Metalic3; @NavbarSelectedBorder: @Metalic2; @NavbarNotifBg: @Blue1; + @Menu: @Grey5; @MenuBg: @Grey1; @MenuBorder: @Metalic3; +@MenuItem: @Grey5; +@MenuItemHoverBg: @Metalic1; +@MenuItemSeparator: @Metalic2; +@MenuEmpty: @Metalic2; +@MenuItemDetail: @Metalic2; + +@AsideBorder: @Metalic1; + + diff --git a/view/theme/quattro/quattro.less b/view/theme/quattro/quattro.less index 4c4a002f3..f83cce3ce 100644 --- a/view/theme/quattro/quattro.less +++ b/view/theme/quattro/quattro.less @@ -6,8 +6,8 @@ body { font-size: 12px; background-color: @BodyBackground; color: @BodyColor; - margin: 0px; - display:table-row; + margin: 50px 0px 0px 0px; + display:table; } .shadow(@x: 0px, @y: 5px){ @@ -175,15 +175,15 @@ ul.menu-popup { .shadow(); - a { display: block; color: @Grey5; padding: 5px 10px;} - a:hover { background-color: @Metalic1; } - .menu-sep { border-top: 1px solid @Metalic2; } + a { display: block; color: @MenuItem; padding: 5px 10px;} + a:hover { background-color: @MenuItemHoverBg; } + .menu-sep { border-top: 1px solid @MenuItemSeparator; } li { float: none; overflow: auto; height: auto; display: block; } .empty { padding: 5px; text-align: center; - color: @Metalic2; + color: @MenuEmpty; } } @@ -191,7 +191,7 @@ ul.menu-popup { width: 400px; img { float: left; margin-right: 5px; } .contactname { font-weight: bold; } - .notif-when { font-size: 10px; color: @Metalic2; display: block; } + .notif-when { font-size: 10px; color: @MenuItemDetail; display: block; } } @@ -201,12 +201,13 @@ ul.menu-popup { aside { display: table-cell; width: 200px; - padding:50px 10px 0px 20px; + padding:0px 10px 0px 20px; + border-right: 1px solid @AsideBorder; } /* section */ section { display: table-cell; width: 800px; - padding:50px 20px 0px 10px; + padding:0px 20px 0px 10px; } diff --git a/view/theme/quattro/style.css b/view/theme/quattro/style.css index e2c06125b..e0d22a007 100644 --- a/view/theme/quattro/style.css +++ b/view/theme/quattro/style.css @@ -7,8 +7,8 @@ body { font-size: 12px; background-color: #ffffff; color: #2d2d2d; - margin: 0px; - display: table-row; + margin: 50px 0px 0px 0px; + display: table; } a, a:link { color: #005c94; @@ -247,11 +247,12 @@ ul.menu-popup .empty { aside { display: table-cell; width: 200px; - padding: 50px 10px 0px 20px; + padding: 0px 10px 0px 20px; + border-right: 1px solid #bdcdd4; } /* section */ section { display: table-cell; width: 800px; - padding: 50px 20px 0px 10px; + padding: 0px 20px 0px 10px; } -- cgit v1.2.3 From 8b615133d528eb074a23746afef6201f474a4e3f Mon Sep 17 00:00:00 2001 From: Fabio Comuni Date: Wed, 31 Aug 2011 17:31:44 +0200 Subject: remove html from profile vcard code --- view/contact_block.tpl | 9 +++++++++ view/diaspora_vcard.tpl | 44 ++++++++++++++++++++++++++++++++++++++++++++ view/profile_vcard.tpl | 40 +++++++++++++++++++++++++++------------- 3 files changed, 80 insertions(+), 13 deletions(-) create mode 100644 view/contact_block.tpl create mode 100644 view/diaspora_vcard.tpl (limited to 'view') diff --git a/view/contact_block.tpl b/view/contact_block.tpl new file mode 100644 index 000000000..00b97a6d8 --- /dev/null +++ b/view/contact_block.tpl @@ -0,0 +1,9 @@ +

    $contacts

    +{{ if $micropro }} +
    + {{ for $micropro as $m }} + $m + {{ endfor }} +
    + +{{ endif }} diff --git a/view/diaspora_vcard.tpl b/view/diaspora_vcard.tpl new file mode 100644 index 000000000..aa2c9eded --- /dev/null +++ b/view/diaspora_vcard.tpl @@ -0,0 +1,44 @@ +
    +
    +
    Nickname
    +
    + $diaspora.nickname +
    +
    +
    +
    Full name
    +
    + $diaspora.fullname +
    +
    +
    +
    URL
    +
    + $diaspora.podloc/ +
    +
    +
    +
    Photo
    +
    + +
    +
    +
    +
    Photo
    +
    + +
    +
    +
    +
    Photo
    +
    + +
    +
    +
    +
    Searchable
    +
    + $diaspora.searchable +
    +
    +
    diff --git a/view/profile_vcard.tpl b/view/profile_vcard.tpl index 34f265ee6..01238ed5a 100644 --- a/view/profile_vcard.tpl +++ b/view/profile_vcard.tpl @@ -1,29 +1,43 @@
    - $fullname - $pdesc - $tabs - - $photo +
    $profile.name
    + {{ if $pdesc }}
    $profile.pdesc
    {{ endif }} +
    $profile.name
    - $location + {{ if $location }} +
    $location +
    + {{ if $profile.address }}
    $profile.address
    {{ endif }} + + $profile.locality{{ if $profile.locality }}, {{ endif }} + $profile.region + $profile.postal-code + + {{ if $profile.country-name }}$profile.country-name{{ endif }} +
    + + {{ endif }} - $gender + {{ if $gender }}
    $gender $profile.gender
    {{ endif }} + + {{ if $profile.pubkey }}{{ endif }} - $pubkey + {{ if $marital }}
    ♥$marital$profile.marital
    {{ endif }} -$diaspora + {{ if $homepage }}
    $homepage$profile.homepage
    {{ endif }} -
    + {{ inc diaspora_vcard.tpl }}{{ endinc }} -$marital +
    -$homepage +$contact_block -- cgit v1.2.3 From 058e329dfbc2678fa7e3cb2ce130fb9ffd69b84d Mon Sep 17 00:00:00 2001 From: Fabio Comuni Date: Thu, 1 Sep 2011 12:37:30 +0200 Subject: Fix profile vcard and style --- view/profile_vcard.tpl | 31 +++++++++++++-------------- view/theme/quattro/colors.less | 3 +++ view/theme/quattro/quattro.less | 30 +++++++++++++++++++++++++++ view/theme/quattro/style.css | 46 +++++++++++++++++++++++++++++++++++++++++ 4 files changed, 95 insertions(+), 15 deletions(-) (limited to 'view') diff --git a/view/profile_vcard.tpl b/view/profile_vcard.tpl index 01238ed5a..88111b0f1 100644 --- a/view/profile_vcard.tpl +++ b/view/profile_vcard.tpl @@ -4,17 +4,11 @@ {{ if $pdesc }}
    $profile.pdesc
    {{ endif }}
    $profile.name
    - + {{ if $location }} -
    $location -
    +
    $location
    +
    {{ if $profile.address }}
    $profile.address
    {{ endif }} $profile.locality{{ if $profile.locality }}, {{ endif }} @@ -22,20 +16,27 @@ $profile.postal-code {{ if $profile.country-name }}$profile.country-name{{ endif }} -
    - + + {{ endif }} - {{ if $gender }}
    $gender $profile.gender
    {{ endif }} + {{ if $gender }}
    $gender
    $profile.gender
    {{ endif }} {{ if $profile.pubkey }}{{ endif }} - {{ if $marital }}
    ♥$marital$profile.marital
    {{ endif }} + {{ if $marital }}
    ♥$marital
    $profile.marital
    {{ endif }} - {{ if $homepage }}
    $homepage$profile.homepage
    {{ endif }} + {{ if $homepage }}
    $homepage
    $profile.homepage
    {{ endif }} {{ inc diaspora_vcard.tpl }}{{ endinc }} - + +
    $contact_block diff --git a/view/theme/quattro/colors.less b/view/theme/quattro/colors.less index d79dbca68..6015c61ee 100644 --- a/view/theme/quattro/colors.less +++ b/view/theme/quattro/colors.less @@ -55,6 +55,9 @@ @MenuItemDetail: @Metalic2; @AsideBorder: @Metalic1; +@AsideConnect: @Grey1; +@AsideConnectBg: @Blue3; +@AsideConnectHoverBg: @Blue1; diff --git a/view/theme/quattro/quattro.less b/view/theme/quattro/quattro.less index f83cce3ce..d21c3c182 100644 --- a/view/theme/quattro/quattro.less +++ b/view/theme/quattro/quattro.less @@ -203,8 +203,38 @@ aside { width: 200px; padding:0px 10px 0px 20px; border-right: 1px solid @AsideBorder; + + .vcard { + .fn { font-size: 16px; font-weight: bold; margin-bottom: 5px; } + .title { margin-bottom: 5px; } + dl { height: auto; overflow: auto; } + dt {float: left; margin-left: 0px; width: 35%; } + dd {float: left; margin-left: 4px; width: 60%;} + + } + + #profile-extra-links { + ul { padding: 0px; margin: 0px; } + li { padding: 0px; margin: 0px; list-style: none; } + } + + #dfrn-request-link { + display: block; + .rounded(); + color: @AsideConnect; + background: @AsideConnectBg url('../../../images/connect-bg.png') no-repeat left center; + font-weight: bold; + text-transform:uppercase; + padding: 4px 2px 2px 35px; + + &:hover { text-decoration: none; background-color: @AsideConnectHoverBg; } + } + } + + + /* section */ section { display: table-cell; diff --git a/view/theme/quattro/style.css b/view/theme/quattro/style.css index e0d22a007..28e6f5fa1 100644 --- a/view/theme/quattro/style.css +++ b/view/theme/quattro/style.css @@ -250,6 +250,52 @@ aside { padding: 0px 10px 0px 20px; border-right: 1px solid #bdcdd4; } +aside .vcard .fn { + font-size: 16px; + font-weight: bold; + margin-bottom: 5px; +} +aside .vcard .title { + margin-bottom: 5px; +} +aside .vcard dl { + height: auto; + overflow: auto; +} +aside .vcard dt { + float: left; + margin-left: 0px; + width: 35%; +} +aside .vcard dd { + float: left; + margin-left: 4px; + width: 60%; +} +aside #profile-extra-links ul { + padding: 0px; + margin: 0px; +} +aside #profile-extra-links li { + padding: 0px; + margin: 0px; + list-style: none; +} +aside #dfrn-request-link { + display: block; + -moz-border-radius: 5px 5px 5px 5px; + -webkit-border-radius: 5px 5px 5px 5px; + border-radius: 5px 5px 5px 5px; + color: #ffffff; + background: #005c94 url('../../../images/connect-bg.png') no-repeat left center; + font-weight: bold; + text-transform: uppercase; + padding: 4px 2px 2px 35px; +} +aside #dfrn-request-link:hover { + text-decoration: none; + background-color: #19aeff; +} /* section */ section { display: table-cell; -- cgit v1.2.3 From ab5bda526e9fffcfeecd384332372531c18c49dc Mon Sep 17 00:00:00 2001 From: Fabio Comuni Date: Mon, 5 Sep 2011 11:14:43 +0200 Subject: move icons style in new file --- view/theme/quattro/icons.less | 37 ++++++++++++++ view/theme/quattro/quattro.less | 47 +++++++++--------- view/theme/quattro/style.css | 104 +++++++++++++++++++++++++++++++++------- view/theme/quattro/style.less | 1 + 4 files changed, 146 insertions(+), 43 deletions(-) create mode 100644 view/theme/quattro/icons.less (limited to 'view') diff --git a/view/theme/quattro/icons.less b/view/theme/quattro/icons.less new file mode 100644 index 000000000..8f7111aff --- /dev/null +++ b/view/theme/quattro/icons.less @@ -0,0 +1,37 @@ +/* icons */ + +.icons(@size: 22) { + &.notify { background-image: url("../../../images/icons/@{size}/notify_off.png"); } + &.gear { background-image: url("../../../images/icons/@{size}/gear.png"); } + + &.add { background-image: url("../../../images/icons/@{size}/add.png"); } + &.delete { background-image: url("../../../images/icons/@{size}/delete.png"); } + &.edit { background-image: url("../../../images/icons/@{size}/edit.png"); } + &.start { background-image: url("../../../images/icons/@{size}/star.png"); } +} + + +.icon { + background-color: transparent ; + background-repeat: no-repeat; + background-position: center center; + display: block; + overflow: hidden; + text-indent: -9999px; + padding: 1px; + + &.text { + text-indent: 0px; + } + + &.s16 { + width:22px; height: 22px; + .icons(16); + } + &.s22 { + width:22px; height: 22px; + .icons(22); + } + + +} diff --git a/view/theme/quattro/quattro.less b/view/theme/quattro/quattro.less index d21c3c182..c7cbe7ebb 100644 --- a/view/theme/quattro/quattro.less +++ b/view/theme/quattro/quattro.less @@ -32,33 +32,13 @@ a:hover {color: @LinkHover; text-decoration: underline; } .left { float: left; } .right { float: right; } -/* icons */ - - -.icons(@size: 22) { - &.notify { background-image: url("../../../images/icons/notify_off_@{size}.png"); } - &.gear { background-image: url("../../../images/icons/gear_@{size}.png"); } -} - - -.icon { - background-color: transparent ; - background-repeat: no-repeat; - background-position: center center; - display: block; - overflow: hidden; - text-indent: -9999px; - - &.s22 { - width:22px; height: 22px; - padding: 1px; - .icons(22); - } - +.tool { + height: auto; overflow: auto; + .label { float: left;} + .icon { float: right; } } - /* header */ header { position: fixed; left: 43%; right: 43%; top: 0px; @@ -156,7 +136,7 @@ nav { .menu-popup{ right: 0px; left: auto; } } - #nav-notifications-linkmenu.selected .icon.s22.notify { background-image: url("../../../images/icons/notify_on_22.png") } + #nav-notifications-linkmenu.selected .icon.s22.notify { background-image: url("../../../images/icons/22/notify_on.png") } #nav-apps-link.selected { background-color: @NavbarSelectedBg; } } @@ -232,6 +212,20 @@ aside { } +#contact-block { + overflow: auto; height: auto; + .contact-block-h4 { float: left; margin: 5px 0px; } + .allcontact-link { float: right; margin: 5px 0px; } + .contact-block-content { + clear: both; + overflow: auto; height: auto; + } + .contact-block-link { + float: left; + margin: 0px 2px 2px 0px; + } +} + @@ -241,3 +235,6 @@ section { width: 800px; padding:0px 20px 0px 10px; } + + + diff --git a/view/theme/quattro/style.css b/view/theme/quattro/style.css index 28e6f5fa1..2b950c3ef 100644 --- a/view/theme/quattro/style.css +++ b/view/theme/quattro/style.css @@ -1,6 +1,63 @@ /** * Fabio Comuni **/ +/* icons */ +.icon { + background-color: transparent ; + background-repeat: no-repeat; + background-position: center center; + display: block; + overflow: hidden; + text-indent: -9999px; + padding: 1px; +} +.icon.text { + text-indent: 0px; +} +.icon.s16 { + width: 22px; + height: 22px; +} +.icon.s16.notify { + background-image: url("../../../images/icons/16/notify_off.png"); +} +.icon.s16.gear { + background-image: url("../../../images/icons/16/gear.png"); +} +.icon.s16.add { + background-image: url("../../../images/icons/16/add.png"); +} +.icon.s16.delete { + background-image: url("../../../images/icons/16/delete.png"); +} +.icon.s16.edit { + background-image: url("../../../images/icons/16/edit.png"); +} +.icon.s16.start { + background-image: url("../../../images/icons/16/star.png"); +} +.icon.s22 { + width: 22px; + height: 22px; +} +.icon.s22.notify { + background-image: url("../../../images/icons/22/notify_off.png"); +} +.icon.s22.gear { + background-image: url("../../../images/icons/22/gear.png"); +} +.icon.s22.add { + background-image: url("../../../images/icons/22/add.png"); +} +.icon.s22.delete { + background-image: url("../../../images/icons/22/delete.png"); +} +.icon.s22.edit { + background-image: url("../../../images/icons/22/edit.png"); +} +.icon.s22.start { + background-image: url("../../../images/icons/22/star.png"); +} /* global */ body { font-family: Liberation Sans, helvetica, arial, clean, sans-serif; @@ -28,25 +85,15 @@ a:hover { .right { float: right; } -/* icons */ -.icon { - background-color: transparent ; - background-repeat: no-repeat; - background-position: center center; - display: block; - overflow: hidden; - text-indent: -9999px; -} -.icon.s22 { - width: 22px; - height: 22px; - padding: 1px; +.tool { + height: auto; + overflow: auto; } -.icon.s22.notify { - background-image: url("../../../images/icons/notify_off_22.png"); +.tool .label { + float: left; } -.icon.s22.gear { - background-image: url("../../../images/icons/gear_22.png"); +.tool .icon { + float: right; } /* header */ header { @@ -186,7 +233,7 @@ nav #nav-site-linkmenu .menu-popup { left: auto; } nav #nav-notifications-linkmenu.selected .icon.s22.notify { - background-image: url("../../../images/icons/notify_on_22.png"); + background-image: url("../../../images/icons/22/notify_on.png"); } nav #nav-apps-link.selected { background-color: #364e59; @@ -296,6 +343,27 @@ aside #dfrn-request-link:hover { text-decoration: none; background-color: #19aeff; } +#contact-block { + overflow: auto; + height: auto; +} +#contact-block .contact-block-h4 { + float: left; + margin: 5px 0px; +} +#contact-block .allcontact-link { + float: right; + margin: 5px 0px; +} +#contact-block .contact-block-content { + clear: both; + overflow: auto; + height: auto; +} +#contact-block .contact-block-link { + float: left; + margin: 0px 2px 2px 0px; +} /* section */ section { display: table-cell; diff --git a/view/theme/quattro/style.less b/view/theme/quattro/style.less index d1c677b22..c3dbae777 100644 --- a/view/theme/quattro/style.less +++ b/view/theme/quattro/style.less @@ -6,6 +6,7 @@ // $ lessc style.less > style.css @import "colors"; +@import "icons"; @import "quattro"; -- cgit v1.2.3 From 20ca4512000e80386fe6f9b3fd85864bc0e91627 Mon Sep 17 00:00:00 2001 From: Fabio Comuni Date: Mon, 5 Sep 2011 11:15:30 +0200 Subject: move js to js folder --- view/admin_remoteupdate.tpl | 2 +- view/head.tpl | 8 +++++--- view/jot-header.tpl | 2 +- view/msg-header.tpl | 2 +- view/theme/dispy/jot-header.tpl | 2 +- 5 files changed, 9 insertions(+), 7 deletions(-) (limited to 'view') diff --git a/view/admin_remoteupdate.tpl b/view/admin_remoteupdate.tpl index 0c15692c2..41ecfaf85 100644 --- a/view/admin_remoteupdate.tpl +++ b/view/admin_remoteupdate.tpl @@ -1,4 +1,4 @@ - + + + - - + + - + - + - + + diff --git a/view/theme/quattro/colors.less b/view/theme/quattro/colors.less index 6015c61ee..3d3074d60 100644 --- a/view/theme/quattro/colors.less +++ b/view/theme/quattro/colors.less @@ -59,5 +59,8 @@ @AsideConnectBg: @Blue3; @AsideConnectHoverBg: @Blue1; +@InfoColor: @Grey1; +@InfoBackgroundColor: @Metalic3; - +@NoticeColor: @Grey1; +@NoticeBackgroundColor: #511919; diff --git a/view/theme/quattro/quattro.less b/view/theme/quattro/quattro.less index c7cbe7ebb..2c4e0464a 100644 --- a/view/theme/quattro/quattro.less +++ b/view/theme/quattro/quattro.less @@ -38,6 +38,19 @@ a:hover {color: @LinkHover; text-decoration: underline; } .icon { float: right; } } +/* popup notifications */ +div.jGrowl div.notice { + background: @NoticeBackgroundColor url("../../../images/icons/48/notice.png") no-repeat 5px center; + color: @NoticeColor; + padding-left: 58px; +} +div.jGrowl div.info { + background: @InfoBackgroundColor url("../../../images/icons/48/info.png") no-repeat 5px center; + color: @InfoColor; + padding-left: 58px; +} + + /* header */ header { @@ -237,4 +250,3 @@ section { } - diff --git a/view/theme/quattro/style.css b/view/theme/quattro/style.css index 2b950c3ef..0fce02f03 100644 --- a/view/theme/quattro/style.css +++ b/view/theme/quattro/style.css @@ -95,6 +95,17 @@ a:hover { .tool .icon { float: right; } +/* popup notifications */ +div.jGrowl div.notice { + background: #511919 url("../../../images/icons/48/notice.png") no-repeat 5px center; + color: #ffffff; + padding-left: 58px; +} +div.jGrowl div.info { + background: #364e59 url("../../../images/icons/48/info.png") no-repeat 5px center; + color: #ffffff; + padding-left: 58px; +} /* header */ header { position: fixed; -- cgit v1.2.3 From 08e54234e30c10e3130b7d71caba9fd43e3593e3 Mon Sep 17 00:00:00 2001 From: Fabio Comuni Date: Mon, 5 Sep 2011 16:55:40 +0200 Subject: profiles popup menu in sidebar --- view/profile_vcard.tpl | 15 ++++++++++++++- view/theme/quattro/quattro.less | 6 +++--- view/theme/quattro/style.css | 9 ++++++++- 3 files changed, 25 insertions(+), 5 deletions(-) (limited to 'view') diff --git a/view/profile_vcard.tpl b/view/profile_vcard.tpl index ecdb5280f..cab732cc1 100644 --- a/view/profile_vcard.tpl +++ b/view/profile_vcard.tpl @@ -2,8 +2,21 @@
    $profile.name
    - {{ if $profile.edit }}$profile.edit.1{{ endif }} + {{ if $profile.edit }} +
    + $profile.edit.1 + +
    + {{ endif }}
    + {{ if $pdesc }}
    $profile.pdesc
    {{ endif }}
    $profile.name
    diff --git a/view/theme/quattro/quattro.less b/view/theme/quattro/quattro.less index 2c4e0464a..01d0b94b9 100644 --- a/view/theme/quattro/quattro.less +++ b/view/theme/quattro/quattro.less @@ -35,7 +35,7 @@ a:hover {color: @LinkHover; text-decoration: underline; } .tool { height: auto; overflow: auto; .label { float: left;} - .icon { float: right; } + .action { float: right; } } /* popup notifications */ @@ -168,11 +168,11 @@ ul.menu-popup { .shadow(); - a { display: block; color: @MenuItem; padding: 5px 10px;} + a { display: block; color: @MenuItem; padding: 5px 10px; text-decoration: none;} a:hover { background-color: @MenuItemHoverBg; } .menu-sep { border-top: 1px solid @MenuItemSeparator; } li { float: none; overflow: auto; height: auto; display: block; } - + li img { float: left; width: 16px; height: 16px; padding-right: 5px;} .empty { padding: 5px; text-align: center; diff --git a/view/theme/quattro/style.css b/view/theme/quattro/style.css index 0fce02f03..6daef77a3 100644 --- a/view/theme/quattro/style.css +++ b/view/theme/quattro/style.css @@ -92,7 +92,7 @@ a:hover { .tool .label { float: left; } -.tool .icon { +.tool .action { float: right; } /* popup notifications */ @@ -268,6 +268,7 @@ ul.menu-popup a { display: block; color: #2d2d2d; padding: 5px 10px; + text-decoration: none; } ul.menu-popup a:hover { background-color: #bdcdd4; @@ -281,6 +282,12 @@ ul.menu-popup li { height: auto; display: block; } +ul.menu-popup li img { + float: left; + width: 16px; + height: 16px; + padding-right: 5px; +} ul.menu-popup .empty { padding: 5px; text-align: center; -- cgit v1.2.3 From 2f93a4d70dbdc1c8affa05dc7a09638c542e2fa3 Mon Sep 17 00:00:00 2001 From: Fabio Comuni Date: Thu, 8 Sep 2011 10:11:57 +0200 Subject: style vcard infos --- view/theme/quattro/colors.less | 1 + view/theme/quattro/quattro.less | 3 ++- view/theme/quattro/style.css | 4 +++- 3 files changed, 6 insertions(+), 2 deletions(-) (limited to 'view') diff --git a/view/theme/quattro/colors.less b/view/theme/quattro/colors.less index 3d3074d60..b5a203b94 100644 --- a/view/theme/quattro/colors.less +++ b/view/theme/quattro/colors.less @@ -58,6 +58,7 @@ @AsideConnect: @Grey1; @AsideConnectBg: @Blue3; @AsideConnectHoverBg: @Blue1; +@VCardLabelColor: @Grey3; @InfoColor: @Grey1; @InfoBackgroundColor: @Metalic3; diff --git a/view/theme/quattro/quattro.less b/view/theme/quattro/quattro.less index 01d0b94b9..54bd11806 100644 --- a/view/theme/quattro/quattro.less +++ b/view/theme/quattro/quattro.less @@ -149,6 +149,7 @@ nav { .menu-popup{ right: 0px; left: auto; } } + #nav-notifications-linkmenu.on .icon.s22.notify, #nav-notifications-linkmenu.selected .icon.s22.notify { background-image: url("../../../images/icons/22/notify_on.png") } #nav-apps-link.selected { background-color: @NavbarSelectedBg; } } @@ -201,7 +202,7 @@ aside { .fn { font-size: 16px; font-weight: bold; margin-bottom: 5px; } .title { margin-bottom: 5px; } dl { height: auto; overflow: auto; } - dt {float: left; margin-left: 0px; width: 35%; } + dt {float: left; margin-left: 0px; width: 35%; text-align: right; color: @VCardLabelColor; } dd {float: left; margin-left: 4px; width: 60%;} } diff --git a/view/theme/quattro/style.css b/view/theme/quattro/style.css index 6daef77a3..70e0a3b94 100644 --- a/view/theme/quattro/style.css +++ b/view/theme/quattro/style.css @@ -243,7 +243,7 @@ nav #nav-site-linkmenu .menu-popup { right: 0px; left: auto; } -nav #nav-notifications-linkmenu.selected .icon.s22.notify { +nav #nav-notifications-linkmenu.on .icon.s22.notify, nav #nav-notifications-linkmenu.selected .icon.s22.notify { background-image: url("../../../images/icons/22/notify_on.png"); } nav #nav-apps-link.selected { @@ -331,6 +331,8 @@ aside .vcard dt { float: left; margin-left: 0px; width: 35%; + text-align: right; + color: #999999; } aside .vcard dd { float: left; -- cgit v1.2.3 From 7e806429cca6ac39a9ef1bd1fd400d03e626389b Mon Sep 17 00:00:00 2001 From: Fabio Comuni Date: Thu, 15 Sep 2011 10:38:37 +0200 Subject: quattro --- view/profile_vcard.tpl | 4 +++- view/theme/quattro/quattro.less | 5 ++++- view/theme/quattro/style.css | 5 ++++- 3 files changed, 11 insertions(+), 3 deletions(-) (limited to 'view') diff --git a/view/profile_vcard.tpl b/view/profile_vcard.tpl index cab732cc1..d65b65784 100644 --- a/view/profile_vcard.tpl +++ b/view/profile_vcard.tpl @@ -7,7 +7,9 @@ $profile.edit.1