]> source.dussan.org Git - gitblit.git/commitdiff
Final CSS/layout tweaks for responsive UI (issue 101)
authorJames Moger <james.moger@gitblit.com>
Wed, 11 Jul 2012 03:18:11 +0000 (23:18 -0400)
committerJames Moger <james.moger@gitblit.com>
Wed, 11 Jul 2012 03:18:11 +0000 (23:18 -0400)
resources/gitblit.css
src/com/gitblit/wicket/pages/ActivityPage.html
src/com/gitblit/wicket/pages/BasePage.html
src/com/gitblit/wicket/pages/CommitPage.html
src/com/gitblit/wicket/pages/LuceneSearchPage.html
src/com/gitblit/wicket/pages/SummaryPage.html
src/com/gitblit/wicket/pages/TreePage.html
src/com/gitblit/wicket/panels/ActivityPanel.html
src/com/gitblit/wicket/panels/ActivityPanel.java
src/com/gitblit/wicket/panels/TeamsPanel.html
src/com/gitblit/wicket/panels/UsersPanel.html

index 051ad07678a5cd53142f8904c0aa9a7fae6f2959..d2acaf5c2ddd3d626930ce36c79f1faa8ce3dd1d 100644 (file)
@@ -90,7 +90,7 @@ hr {
        background-image: url(arrow_page.png);\r
        background-position: center bottom;\r
        outline: 0;\r
-       padding-bottom:2px;\r
+       padding-bottom:3px;\r
 }\r
 \r
 .navbar .active a {\r
@@ -649,7 +649,7 @@ table.plain {
 \r
 table.plain th, table.plain td {\r
        white-space: nowrap;\r
-       padding: 1px 6px;\r
+       padding: 1px 3px;\r
        border: 0;\r
 }\r
 \r
index ab8a53ad53a5cc238bda4e8bedb36f2c348aa29c..4b10c2cf6a93ed9e71cc24eeb8098de96dc55f3d 100644 (file)
@@ -6,7 +6,7 @@
 <body>\r
 <wicket:extend>\r
        <div class="pageTitle">\r
-               <h2><wicket:message key="gb.recentActivity"></wicket:message><small> / <span wicket:id="subheader">[days back]</span></small></h2>\r
+               <h2><wicket:message key="gb.recentActivity"></wicket:message><small> <span class="hidden-phone">/ <span wicket:id="subheader">[days back]</span></span></small></h2>\r
        </div>\r
        <div class="hidden-phone" style="height: 155px;text-align: center;">\r
                <table>\r
index 1279d4499e58bd622a1e756af923f652fea3d9df..4a642e73fb959d605a933f4fb910730dcfb5f6e5 100644 (file)
        <wicket:fragment wicket:id="userFragment">\r
                <span class="userPanel" wicket:id="username"></span>\r
                <span class="userPanel" wicket:id="loginLink"></span>\r
-               <span class="userPanel" wicket:id="separator"></span>\r
-               <span class="userPanel"><a wicket:id="changePasswordLink"><wicket:message key="gb.changePassword"></wicket:message></a></span>\r
+               <span class="hidden-phone">\r
+                       <span class="userPanel" wicket:id="separator"></span>\r
+                       <span class="userPanel"><a wicket:id="changePasswordLink"><wicket:message key="gb.changePassword"></wicket:message></a></span>\r
+               </span>\r
        </wicket:fragment>\r
        \r
 </html>
\ No newline at end of file
index 9555ddd1bb315d760eb99b13c67f3c1d796cfbe1..354b7ba4f3209d20ac5515c137f073513e3442c8 100644 (file)
                <tr><th><wicket:message key="gb.author">author</wicket:message></th><td><span class="sha1" wicket:id="commitAuthor">[author</span></td></tr>\r
                <tr><th></th><td><span class="sha1" wicket:id="commitAuthorDate">[author date]</span></td></tr>\r
                <tr><th><wicket:message key="gb.committer">committer</wicket:message></th><td><span class="sha1" wicket:id="commitCommitter">[committer]</span></td></tr>\r
-               <tr><th></th><td><span class="sha1" wicket:id="commitCommitterDate">[commit date]</span></td></tr>\r
-               <tr><th><wicket:message key="gb.commit">commit</wicket:message></th><td><span class="sha1" wicket:id="commitId">[commit id]</span></td></tr>\r
-               <tr><th><wicket:message key="gb.tree">tree</wicket:message></th>\r
+               <tr class="hidden-phone"><th></th><td><span class="sha1" wicket:id="commitCommitterDate">[commit date]</span></td></tr>\r
+               <tr class="hidden-phone"><th><wicket:message key="gb.commit">commit</wicket:message></th><td><span class="sha1" wicket:id="commitId">[commit id]</span></td></tr>\r
+               <tr class="hidden-phone"><th><wicket:message key="gb.tree">tree</wicket:message></th>\r
                        <td><span class="sha1" wicket:id="commitTree">[commit tree]</span>\r
                                <span class="link">\r
                                        <a wicket:id="treeLink"><wicket:message key="gb.tree"></wicket:message></a> | <a wicket:id="zipLink"><wicket:message key="gb.zip"></wicket:message></a>\r
                                </span>\r
                        </td></tr>\r
-               <tr><th valign="top"><wicket:message key="gb.parent">parent</wicket:message></th>\r
+               <tr class="hidden-phone"><th valign="top"><wicket:message key="gb.parent">parent</wicket:message></th>\r
                        <td>\r
                                <span wicket:id="commitParents">\r
                                        <span class="sha1" wicket:id="commitParent">[commit parents]</span>\r
index d6c762259de35e3b10c08857ff065310fde50bbe..aba43de8b7b3f64228fc32193493b222c5aa8c7c 100644 (file)
                                <h3><wicket:message key="gb.repositories"></wicket:message></h3>\r
                                <select wicket:id="repositories" ></select>\r
                        </div>\r
-                       <div class="span9">\r
+                       <div class="span9" style="margin-left:10px">\r
                                <div>\r
                                        <h3><wicket:message key="gb.query"></wicket:message></h3>\r
-                                       <input class="span8" id="query" wicket:id="query" placeholder="enter search text"></input>\r
+                                       <input class="span8" id="query" type="text" wicket:id="query" placeholder="enter search text"></input>\r
                                        <button class="btn btn-primary" type="submit" value="Search"><wicket:message key="gb.search"></wicket:message></button>\r
                                </div>\r
                                <div style="margin-top:10px;">\r
index 16e8acac00476626a100b092a98ec7e32d97f7d6..45ffddfbea8f8f225cdae02d54b8527439c65035 100644 (file)
                </div>  \r
        \r
                <!-- Repository info -->\r
-               <div style="padding-bottom: 10px;"> \r
+               <div class="hidden-phone" style="padding-bottom: 10px;"> \r
                        <table class="plain">\r
                                <tr><th><wicket:message key="gb.description">[description]</wicket:message></th><td><span wicket:id="repositoryDescription">[repository description]</span></td></tr>\r
                                <tr><th><wicket:message key="gb.owner">[owner]</wicket:message></th><td><span wicket:id="repositoryOwner">[repository owner]</span></td></tr>\r
-                               <tr class="hidden-phone"><th><wicket:message key="gb.lastChange">[last change]</wicket:message></th><td><span wicket:id="repositoryLastChange">[repository last change]</span></td></tr>\r
-                               <tr class="hidden-phone"><th><wicket:message key="gb.stats">[stats]</wicket:message></th><td><span wicket:id="branchStats">[branch stats]</span> <span class="link"><a wicket:id="metrics"><wicket:message key="gb.metrics">[metrics]</wicket:message></a></span></td></tr>\r
-                               <tr><th valign="middle"><wicket:message key="gb.repositoryUrl">[URL]</wicket:message></th><td><img style="vertical-align: middle;" wicket:id="accessRestrictionIcon" /><span wicket:id="repositoryCloneUrl">[repository clone url]</span><div wicket:id="otherUrls" style="margin-left:20px;"></div></td></tr>\r
+                               <tr><th><wicket:message key="gb.lastChange">[last change]</wicket:message></th><td><span wicket:id="repositoryLastChange">[repository last change]</span></td></tr>\r
+                               <tr><th><wicket:message key="gb.stats">[stats]</wicket:message></th><td><span wicket:id="branchStats">[branch stats]</span> <span class="link"><a wicket:id="metrics"><wicket:message key="gb.metrics">[metrics]</wicket:message></a></span></td></tr>\r
+                               <tr><th style="vertical-align:top;"><wicket:message key="gb.repositoryUrl">[URL]</wicket:message>&nbsp;<img style="vertical-align: top;padding-left:3px;" wicket:id="accessRestrictionIcon" /></th><td><span wicket:id="repositoryCloneUrl">[repository clone url]</span><div wicket:id="otherUrls"></div></td></tr>\r
                        </table>\r
                </div>\r
        </div>\r
index 7e7f1fa0e27227a071b6cf2690ad5c1d997708ec..760294f54dd4a0e38ddfa1325ca1fb7f1504537c 100644 (file)
@@ -23,7 +23,7 @@
                <tr wicket:id="changedPath">\r
                        <td class="icon"><img wicket:id="pathIcon" /></td>\r
                        <td><span wicket:id="pathName"></span></td>                     \r
-                       <td class="size"><span wicket:id="pathSize">[path size]</span></td>\r
+                       <td class="hidden-phone size"><span wicket:id="pathSize">[path size]</span></td>\r
                        <td class="hidden-phone mode"><span wicket:id="pathPermissions">[path permissions]</span></td>\r
                        <td class="treeLinks"><span wicket:id="pathLinks">[path links]</span></td>\r
                </tr>\r
        <!--  tree links -->\r
        <wicket:fragment wicket:id="treeLinks">\r
                <span class="link">\r
-                       <a wicket:id="tree"><wicket:message key="gb.tree"></wicket:message></a> | <a wicket:id="history"><wicket:message key="gb.history"></wicket:message></a> | <a wicket:id="zip"><wicket:message key="gb.zip"></wicket:message></a>\r
+                       <span class="hidden-phone"><a wicket:id="tree"><wicket:message key="gb.tree"></wicket:message></a> | </span><a wicket:id="history"><wicket:message key="gb.history"></wicket:message></a> | <a wicket:id="zip"><wicket:message key="gb.zip"></wicket:message></a>\r
                </span>\r
        </wicket:fragment>\r
        \r
        <!-- blob links -->\r
        <wicket:fragment wicket:id="blobLinks">\r
                <span class="link">\r
-                       <a wicket:id="view"><wicket:message key="gb.view"></wicket:message></a> | <a wicket:id="raw"><wicket:message key="gb.raw"></wicket:message></a> | <a wicket:id="blame"><wicket:message key="gb.blame"></wicket:message></a> | <a wicket:id="history"><wicket:message key="gb.history"></wicket:message></a>\r
+                       <span class="hidden-phone"><a wicket:id="view"><wicket:message key="gb.view"></wicket:message></a> | <a wicket:id="raw"><wicket:message key="gb.raw"></wicket:message></a> | <a wicket:id="blame"><wicket:message key="gb.blame"></wicket:message></a> | </span> <a wicket:id="history"><wicket:message key="gb.history"></wicket:message></a>\r
                </span> \r
        </wicket:fragment>\r
        \r
index eb2269b74f30685c09413c6e606fedd06b6c5eb8..f4d14093f6df6ba440553d93e316fbe599185c26 100644 (file)
                                <td style="width:10em;text-align:left;vertical-align: middle;">\r
                                        <span wicket:id="repository" class="repositorySwatch">[repository link]</span>\r
                                </td>\r
-                               <td class="hidden-phone" style="width:30px;vertical-align: middle;"><span wicket:id="avatar" style="vertical-align: middle;"></span></td>\r
-                               <td style="vertical-align: middle;">\r
-                                       <img wicket:id="commitIcon" style="vertical-align: middle;"></img>\r
+                               <td class="hidden-phone hidden-tablet" style="width:30px;vertical-align: middle;"><span wicket:id="avatar" style="vertical-align: middle;"></span></td>\r
+                               <td style="vertical-align: middle;padding-left:15px;">\r
+                                       <img class="hidden-phone hidden-tablet" wicket:id="commitIcon" style="vertical-align: top;"></img>\r
                                        <span wicket:id="message">[shortlog commit link]</span><br/>\r
-                                       <span wicket:id="author" style="padding-left:20px;">[author link]</span> <wicket:message key="gb.authored"></wicket:message> <span wicket:id="commitid">[commit id]</span> on <span wicket:id="branch"></span>\r
+                                       <span wicket:id="author">[author link]</span> <span class="hidden-phone"><wicket:message key="gb.authored"></wicket:message> <span wicket:id="commitid">[commit id]</span></span> on <span wicket:id="branch"></span>\r
                                </td>\r
-                               <td style="text-align:right;vertical-align: middle;">\r
+                               <td class="hidden-phone" style="text-align:right;vertical-align: middle;">\r
                                        <div wicket:id="commitRefs">[commit refs]</div>\r
                                </td>\r
                                <td class="hidden-phone rightAlign" style="width:7em;vertical-align: middle;">\r
index e86a68902dec2e1f054a488276d1029e5f85d0f6..2e70a9a01f05553115274bd599ed76bd325c44a8 100644 (file)
@@ -71,14 +71,14 @@ public class ActivityPanel extends BasePanel {
                                                                .getWhen(), getTimeZone(), getTimeUtils()));\r
 \r
                                                // avatar\r
-                                               commitItem.add(new GravatarImage("avatar", commit.getAuthorIdent(), 36));\r
+                                               commitItem.add(new GravatarImage("avatar", commit.getAuthorIdent(), 40));\r
 \r
                                                // merge icon\r
                                                if (commit.getParentCount() > 1) {\r
                                                        commitItem.add(WicketUtils.newImage("commitIcon",\r
                                                                        "commit_merge_16x16.png"));\r
                                                } else {\r
-                                                       commitItem.add(WicketUtils.newBlankImage("commitIcon"));\r
+                                                       commitItem.add(WicketUtils.newBlankImage("commitIcon").setVisible(false));\r
                                                }\r
 \r
                                                // author search link\r
index e53829054b19e4709bf2b4d971145acf1f053dd5..c6a73cd7ffcfb26bebb5b967036ed91d8091651f 100644 (file)
                                <img style="vertical-align: middle; border: 1px solid #888; background-color: white;" src="users_16x16.png"/>\r
                                <wicket:message key="gb.teams">[teams]</wicket:message>\r
                        </th>\r
-                       <th style="width:140px;"><wicket:message key="gb.teamMembers">[team members]</wicket:message></th>\r
-                       <th style="width:100px;"><wicket:message key="gb.repositories">[repositories]</wicket:message></th>\r
+                       <th class="hidden-phone" style="width:140px;"><wicket:message key="gb.teamMembers">[team members]</wicket:message></th>\r
+                       <th class="hidden-phone" style="width:100px;"><wicket:message key="gb.repositories">[repositories]</wicket:message></th>\r
                        <th style="width:80px;" class="right"></th>\r
                </tr>\r
                <tbody>         \r
                        <tr wicket:id="teamRow">\r
                                <td class="left" ><div class="list" wicket:id="teamname">[teamname]</div></td>\r
-                               <td class="left" ><div class="list" wicket:id="members">[members]</div></td>\r
-                               <td class="left" ><div class="list" wicket:id="repositories">[repositories]</div></td>\r
+                               <td class="hidden-phone left" ><div class="list" wicket:id="members">[members]</div></td>\r
+                               <td class="hidden-phone left" ><div class="list" wicket:id="repositories">[repositories]</div></td>\r
                                <td class="rightAlign"><span wicket:id="teamLinks"></span></td>                         \r
                        </tr>\r
        </tbody>\r
index 24911cd2c991819f3dd3f1541cc0fc06ac83eb8a..aaa7870a7ed1e24f1e24330ea02aa4c5b0d61b8b 100644 (file)
@@ -16,8 +16,8 @@
                                <wicket:message key="gb.users">[users]</wicket:message>\r
                        </th>\r
                        <th class="hidden-phone hidden-tablet left"><wicket:message key="gb.displayName">[display name]</wicket:message></th>\r
-                       <th style="width:120px;"><wicket:message key="gb.accessLevel">[access level]</wicket:message></th>\r
-                       <th style="width:140px;"><wicket:message key="gb.teamMemberships">[team memberships]</wicket:message></th>\r
+                       <th class="hidden-phone" style="width:120px;"><wicket:message key="gb.accessLevel">[access level]</wicket:message></th>\r
+                       <th class="hidden-phone" style="width:140px;"><wicket:message key="gb.teamMemberships">[team memberships]</wicket:message></th>\r
                        <th class="hidden-phone" style="width:100px;"><wicket:message key="gb.repositories">[repositories]</wicket:message></th>\r
                        <th style="width:80px;" class="right"></th>\r
                </tr>\r
@@ -25,8 +25,8 @@
                        <tr wicket:id="userRow">\r
                                <td class="left" ><span class="list" wicket:id="username">[username]</span></td>\r
                                <td class="hidden-phone hidden-tablet left" ><span class="list" wicket:id="displayName">[display name]</span></td>\r
-                               <td class="left" ><span class="list" wicket:id="accesslevel">[access level]</span></td>\r
-                               <td class="left" ><span class="list" wicket:id="teams">[team memberships]</span></td>\r
+                               <td class="hidden-phone left" ><span class="list" wicket:id="accesslevel">[access level]</span></td>\r
+                               <td class="hidden-phone left" ><span class="list" wicket:id="teams">[team memberships]</span></td>\r
                                <td class="hidden-phone left" ><span class="list" wicket:id="repositories">[repositories]</span></td>\r
                                <td class="rightAlign"><span wicket:id="userLinks"></span></td>                         \r
                        </tr>\r