Menu
▾
▴
[Cronoscontrol-development] SF.net SVN: cronoscontrol:[9] source/trunk/CronosControl/CronosControlWeb
|
From: <mar...@us...> - 2010-02-01 22:26:26
|
Revision: 9
http://cronoscontrol.svn.sourceforge.net/cronoscontrol/?rev=9&view=rev
Author: marioarce
Date: 2010-02-01 22:26:20 +0000 (Mon, 01 Feb 2010)
Log Message:
-----------
Ticket #2
Added the graphical layout of the official website and base styles
Modified Paths:
--------------
source/trunk/CronosControl/CronosControlWeb/Content/Site.css
source/trunk/CronosControl/CronosControlWeb/CronosControlWeb.csproj
source/trunk/CronosControl/CronosControlWeb/Views/Shared/Site.Master
Added Paths:
-----------
source/trunk/CronosControl/CronosControlWeb/Content/SiteMaster.css
source/trunk/CronosControl/CronosControlWeb/Content/images/
source/trunk/CronosControl/CronosControlWeb/Content/images/bottom.gif
source/trunk/CronosControl/CronosControlWeb/Content/images/dot.gif
source/trunk/CronosControl/CronosControlWeb/Content/images/logo.png
source/trunk/CronosControl/CronosControlWeb/Content/images/top.gif
Modified: source/trunk/CronosControl/CronosControlWeb/Content/Site.css
===================================================================
--- source/trunk/CronosControl/CronosControlWeb/Content/Site.css 2010-02-01 15:29:24 UTC (rev 8)
+++ source/trunk/CronosControl/CronosControlWeb/Content/Site.css 2010-02-01 22:26:20 UTC (rev 9)
@@ -5,12 +5,11 @@
----------------------------------------------------------*/
body
{
- background-color: #5c87b2;
- font-size: .75em;
- font-family: Verdana, Helvetica, Sans-Serif;
margin: 0;
padding: 0;
- color: #696969;
+ font-family: Arial, sans-serif;
+ font-size: 1em;
+ text-align: left;
}
a:link
@@ -38,6 +37,12 @@
line-height: 1.6em;
}
+img
+{
+ border: 0 none;
+ display: block;
+}
+
/* HEADINGS
----------------------------------------------------------*/
h1, h2, h3, h4, h5, h6
@@ -70,156 +75,58 @@
font-size: 1em;
}
-/* this rule styles <h2> tags that are the
-first child of the left and right table columns */
-.rightColumn > h1, .rightColumn > h2, .leftColumn > h1, .leftColumn > h2
-{
- margin-top: 0;
-}
-
-/* PRIMARY LAYOUT ELEMENTS
+/* ALIGNMENT
----------------------------------------------------------*/
-/* you can specify a greater or lesser percentage for the
-page width. Or, you can specify an exact pixel width. */
-.page
+.left
{
- width: 90%;
- margin-left: auto;
- margin-right: auto;
+ float: left;
}
-#header
+.right
{
- position: relative;
- margin-bottom: 0px;
- color: #000;
- padding: 0;
+ float: right;
}
-#header h1
-{
- font-weight: bold;
- padding: 5px 0;
- margin: 0;
- color: #fff;
- border: none;
- line-height: 2em;
- font-family: Arial, Helvetica, sans-serif;
- font-size: 32px !important;
-}
-
-#main
-{
- padding: 30px 30px 15px 30px;
- background-color: #fff;
- margin-bottom: 30px;
- _height: 1px; /* only IE6 applies CSS properties starting with an underscrore */
-}
-
-#footer
-{
- color: #999;
- padding: 10px 0;
- text-align: center;
- line-height: normal;
- margin: 0;
- font-size: .9em;
-}
-
-/* TAB MENU
-----------------------------------------------------------*/
-ul#menu
-{
- border-bottom: 1px #5C87B2 solid;
- padding: 0 0 2px;
- position: relative;
- margin: 0;
- text-align: right;
-}
-
-ul#menu li
-{
- display: inline;
- list-style: none;
-}
-
-ul#menu li#greeting
-{
- padding: 10px 20px;
- font-weight: bold;
- text-decoration: none;
- line-height: 2.8em;
- color: #fff;
-}
-
-ul#menu li a
-{
- padding: 10px 20px;
- font-weight: bold;
- text-decoration: none;
- line-height: 2.8em;
- background-color: #e8eef4;
- color: #034af3;
-}
-
-ul#menu li a:hover
-{
- background-color: #fff;
- text-decoration: none;
-}
-
-ul#menu li a:active
-{
- background-color: #a6e2a6;
- text-decoration: none;
-}
-
-ul#menu li.selected a
-{
- background-color: #fff;
- color: #000;
-}
-
/* FORM LAYOUT ELEMENTS
----------------------------------------------------------*/
-fieldset
+fieldset
{
margin: 1em 0;
padding: 1em;
border: 1px solid #CCC;
}
-fieldset p
+fieldset p
{
margin: 2px 12px 10px 10px;
}
-fieldset label
+fieldset label
{
display: block;
}
-fieldset label.inline
+fieldset label.inline
{
display: inline;
}
-legend
+legend
{
font-size: 1.1em;
font-weight: 600;
padding: 2px 4px 8px 4px;
}
-input[type="text"]
+input[type="text"]
{
width: 200px;
border: 1px solid #CCC;
}
-input[type="password"]
+input[type="password"]
{
width: 200px;
border: 1px solid #CCC;
@@ -228,57 +135,53 @@
/* TABLE
----------------------------------------------------------*/
-table
+table
{
- border: solid 1px #e8eef4;
- border-collapse: collapse;
+ border: solid 1px #e8eef4;
+ border-collapse: collapse;
}
-table td
+table td
{
- padding: 5px;
- border: solid 1px #e8eef4;
+ padding: 5px;
+ border: solid 1px #e8eef4;
}
table th
{
- padding: 6px 5px;
- text-align: left;
- background-color: #e8eef4;
- border: solid 1px #e8eef4;
+ padding: 6px 5px;
+ text-align: left;
+ background-color: #F5F8F9;
+ border: solid 1px #F5F8F9;
}
/* MISC
----------------------------------------------------------*/
.clear
{
- clear: both;
+ width: 100%;
+ overflow: hidden;
}
.error
{
- color:Red;
+ color: Red;
}
-#menucontainer
-{
- margin-top:40px;
-}
-
div#title
{
- display:block;
- float:left;
- text-align:left;
+ display: block;
+ float: left;
+ text-align: left;
}
#logindisplay
{
- font-size:1.1em;
- display:block;
- text-align:right;
- margin:10px;
- color:White;
+ font-size: 1.1em;
+ display: block;
+ text-align: right;
+ margin: 10px;
+ color: White;
}
#logindisplay a:link
Added: source/trunk/CronosControl/CronosControlWeb/Content/SiteMaster.css
===================================================================
--- source/trunk/CronosControl/CronosControlWeb/Content/SiteMaster.css (rev 0)
+++ source/trunk/CronosControl/CronosControlWeb/Content/SiteMaster.css 2010-02-01 22:26:20 UTC (rev 9)
@@ -0,0 +1,488 @@
+a, a:link
+{
+ text-decoration: underline;
+ cursor: pointer;
+ color: #0F76BC;
+}
+
+a:visited
+{
+ color: #0F76BC;
+}
+
+a:hover, a:focus, a:active
+{
+ color: #000;
+}
+
+/*========== [layout] ========================================================*/
+body
+{
+ text-align: center;
+ font-family: Arial, sans-serif;
+ background: #000;
+ color: #444;
+ font-size: 1em;
+ line-height: 1.7;
+ padding-bottom: 0;
+}
+
+table
+{
+ line-height: 1.7;
+}
+
+div.content
+{
+ font-size: 0.77em;
+ width: 940px;
+ margin: 0 auto;
+ text-align: left;
+}
+
+/*========== [header] ========================================================*/
+div#head
+{
+ color: #fff;
+ padding: 30px 0 37px;
+ background: #0F76BC url(/Content/images/top.gif) 0 100% repeat-x;
+}
+
+#home div#head, #home div#body
+{
+ background: #0F76BC;
+}
+
+div#logo
+{
+ width: 127px;
+ height: 37px;
+ float: left;
+}
+
+div#menu
+{
+ width: 480px;
+ float: right;
+}
+
+div#menu li
+{
+ float: right;
+ list-style-type: none;
+}
+
+div#menu a, div#menu a:link, div#menu a:visited
+{
+ display: block;
+ color: #fff;
+ text-decoration: none;
+ font-weight: bold;
+ padding: 8px 20px 45px;
+}
+
+div#menu a:hover
+{
+ color: #000;
+}
+
+div#head a.fmenu, div#head a.fmenu:link, div#head a.fmenu:visited
+{
+ padding-right: 0;
+}
+
+div#menu a.active, div#menu a.active:link, div#menu a.active:visited, div#menu a.active:hover
+{
+ color: #000;
+}
+
+div.sm
+{
+ background: #000;
+}
+
+div#sm
+{
+ float: right;
+ width: 500px;
+}
+
+div#sm li
+{
+ float: right;
+}
+
+div#sm a, div#sm a:link, div#sm a:visited
+{
+ display: block;
+ color: #fff;
+ text-decoration: none;
+ padding: 8px 15px 12px;
+}
+
+div#sm a:hover
+{
+ text-decoration: underline;
+}
+
+div#sm a.active
+{
+ font-weight: bold;
+}
+
+div.pn
+{
+ width: 38px;
+ float: left;
+ font-size: 1.8em;
+ font-weight: bold;
+ line-height: 1.0;
+ padding-top: 2px;
+}
+
+div.pn a
+{
+ text-decoration: none;
+ color: #fff;
+ display: block;
+ padding: 4px 4px;
+}
+
+div.pn a.prev
+{
+ float: left;
+ padding-left: 0;
+}
+
+a.next
+{
+ float: right;
+}
+
+div.detail
+{
+ width: 580px;
+ float: right;
+}
+
+/*========== [content] ========================================================*/
+div#body
+{
+ background: #fff;
+ padding-bottom: 20px;
+}
+
+div.home
+{
+ padding-top: 20px;
+}
+
+div.ref div
+{
+ width: 172px;
+ float: left;
+ margin: 0 20px 0 0;
+}
+
+div.ref
+{
+ margin-bottom: 20px;
+}
+
+div.ref div a
+{
+ border: 1px solid #e3e3e3;
+ display: block;
+}
+
+div.ref div a:hover
+{
+ border: 1px solid #0F76BC;
+}
+
+h1, h2
+{
+ font-weight: bold;
+}
+
+h1
+{
+ font-size: 1.6em;
+ color: #0F76BC;
+ margin-bottom: 25px;
+}
+
+h2
+{
+ font-size: 1.4em;
+ margin-bottom: 20px;
+ color: #0079FF;
+}
+
+div#body p, div#body ul
+{
+ padding-left: 5px;
+ margin-bottom: 1.4em;
+}
+
+div#body ul li
+{
+ padding-left: 30px;
+ background: url(/Content/images/dot.gif) 12px 7px no-repeat;
+}
+
+div.text
+{
+ width: 300px;
+ float: left;
+}
+
+div.mImg a
+{
+ display: block;
+}
+
+div.detail
+{
+ margin-top: 15px;
+}
+
+div.popis
+{
+ width: 325px;
+ float: left;
+ padding-top: 6px;
+}
+
+div.thumb
+{
+ width: 218px;
+ float: right;
+}
+
+div.detailWrap
+{
+ padding: 4px 4px 1px 15px;
+ font-size: 0.89em;
+ color: #fff;
+ position: relative;
+}
+
+div.thumb a
+{
+ display: block;
+ border: 1px solid #dddddd;
+}
+
+div.thumb div
+{
+ float: left;
+ margin: 0 4px 4px 0;
+}
+
+div.detail a, div.detail a:link, div.detail a:visited
+{
+ color: #fff;
+}
+
+div.pn2
+{
+ position: absolute;
+ top: -1px;
+ left: -20px;
+ line-height: 1.0;
+ font-size: 1.2em;
+}
+
+div.pn2 a
+{
+ font-weight: bold;
+ padding: 2px 8px 6px;
+ display: block;
+ margin-bottom: 1px;
+ text-decoration: none;
+}
+
+table.char
+{
+ width: 100%;
+}
+
+table.char th
+{
+ color: #777;
+ font-size: 0.89em;
+ text-transform: uppercase;
+ padding-right: 10px;
+ border-right: 1px solid #ddd;
+ font-weight: normal;
+}
+
+table.char td
+{
+ padding-left: 10px;
+}
+
+div.pn a:hover
+{
+ color: #0F76BC;
+}
+
+div.klienti div, div.klienti h3, div.klienti ul, div.klienti ul li
+{
+ float: left;
+ white-space: nowrap;
+}
+
+div#body div.klienti ul, div#body div.klienti ul li
+{
+ padding: 0;
+ margin: 0 0 0 5px;
+ background: transparent;
+}
+
+div#body div.klienti ul
+{
+ margin: 0;
+}
+
+div.klienti div
+{
+ padding: 2px 4px 2px 7px;
+ margin-right: 5px;
+}
+
+div.klienti div h3
+{
+ color: #000;
+ font-weight: normal;
+}
+
+div.klienti div h3:hover
+{
+ cursor: pointer;
+ color: #0F76BC;
+}
+
+div.klienti div.active
+{
+ background: #0F76BC;
+}
+
+div.klienti div.active h3
+{
+ color: #fff;
+ text-decoration: none;
+ font-weight: bold;
+}
+
+div.klienti div.active a, div.klienti div.active a:link, div.klienti div.active a:visited
+{
+ text-decoration: none;
+ background: #fff;
+ color: #0F76BC;
+ padding: 1px 3px 1px;
+}
+
+div.klienti div.active a:hover
+{
+ background: #000;
+ color: #fff;
+}
+
+div.klienti div ul, div.klienti h3 span
+{
+ display: none;
+}
+
+
+div.klienti div.active h3 span
+{
+ display: inline;
+}
+
+div.klienti div.active h3:hover
+{
+ color: #fff;
+ text-decoration: none;
+}
+
+div.klienti
+{
+ position: relative;
+ left: -7px;
+}
+
+div.links a, div.links a:link, div.links a:visited
+{
+ margin-right: 5px;
+ color: #000;
+ text-decoration: none;
+ white-space: nowrap;
+}
+
+div.links a:hover
+{
+ color: #0F76BC;
+}
+
+div.num
+{
+ padding: 70px 0 160px;
+}
+
+div.num div.right
+{
+ width: 430px;
+ height: 137px;
+}
+
+/*========== [footer] ========================================================*/
+div#footer
+{
+ background: #000 url(/Content/images/bottom.gif) 0 0 repeat-x;
+ padding-top: 39px;
+ color: #fff;
+}
+
+#home div#footer
+{
+ background: #000;
+ padding-top: 0;
+}
+
+div#footer div.content div
+{
+ font-size: 0.89em;
+ padding: 8px 0 11px;
+}
+
+div#footer a, div#footer a:link, div#footer a:visited
+{
+ color: #fff;
+}
+
+div#footer div.left a
+{
+ text-decoration: underline;
+}
+
+div#footer div.left a:hover
+{
+ text-decoration: none;
+}
+
+div#footer a:hover
+{
+ text-decoration: none;
+}
+
+div#footer i
+{
+ margin: 0 5px;
+}
+
+.content_back
+{
+ text-align: justify;
+}
Added: source/trunk/CronosControl/CronosControlWeb/Content/images/bottom.gif
===================================================================
(Binary files differ)
Property changes on: source/trunk/CronosControl/CronosControlWeb/Content/images/bottom.gif
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: source/trunk/CronosControl/CronosControlWeb/Content/images/dot.gif
===================================================================
(Binary files differ)
Property changes on: source/trunk/CronosControl/CronosControlWeb/Content/images/dot.gif
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: source/trunk/CronosControl/CronosControlWeb/Content/images/logo.png
===================================================================
(Binary files differ)
Property changes on: source/trunk/CronosControl/CronosControlWeb/Content/images/logo.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: source/trunk/CronosControl/CronosControlWeb/Content/images/top.gif
===================================================================
(Binary files differ)
Property changes on: source/trunk/CronosControl/CronosControlWeb/Content/images/top.gif
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Modified: source/trunk/CronosControl/CronosControlWeb/CronosControlWeb.csproj
===================================================================
--- source/trunk/CronosControl/CronosControlWeb/CronosControlWeb.csproj 2010-02-01 15:29:24 UTC (rev 8)
+++ source/trunk/CronosControl/CronosControlWeb/CronosControlWeb.csproj 2010-02-01 22:26:20 UTC (rev 9)
@@ -76,8 +76,22 @@
<Content Include="App_Data\CronosControl_log.ldf">
<DependentUpon>CronosControl.mdf</DependentUpon>
</Content>
+ <Content Include="Content\images\bottom.gif" />
+ <Content Include="Content\images\dot.gif" />
+ <Content Include="Content\images\logo.png" />
+ <Content Include="Content\images\top.gif" />
+ <Content Include="Content\SiteMaster.css" />
<Content Include="Default.aspx" />
<Content Include="Global.asax" />
+ <Content Include="Scripts\images\ui-bg_flat_0_aaaaaa_40x100.png" />
+ <Content Include="Scripts\images\ui-bg_glass_75_d0e5f5_1x400.png" />
+ <Content Include="Scripts\images\ui-bg_glass_85_dfeffc_1x400.png" />
+ <Content Include="Scripts\images\ui-bg_gloss-wave_55_5c9ccc_500x100.png" />
+ <Content Include="Scripts\images\ui-bg_inset-hard_100_fcfdfd_1x100.png" />
+ <Content Include="Scripts\images\ui-icons_cd0a0a_256x240.png" />
+ <Content Include="Scripts\images\ui-icons_f9bd01_256x240.png" />
+ <Content Include="Scripts\jquery-ui-1.7.2.custom.css" />
+ <Content Include="Scripts\jquery-ui-1.7.2.custom.min.js" />
<Content Include="Views\Projects\ProjectsList.aspx" />
<Content Include="Web.config" />
<Content Include="Content\Site.css" />
Modified: source/trunk/CronosControl/CronosControlWeb/Views/Shared/Site.Master
===================================================================
--- source/trunk/CronosControl/CronosControlWeb/Views/Shared/Site.Master 2010-02-01 15:29:24 UTC (rev 8)
+++ source/trunk/CronosControl/CronosControlWeb/Views/Shared/Site.Master 2010-02-01 22:26:20 UTC (rev 9)
@@ -3,36 +3,55 @@
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head runat="server">
- <title><asp:ContentPlaceHolder ID="TitleContent" runat="server" /></title>
- <link href="../../Content/Site.css" rel="stylesheet" type="text/css" />
+ <title>
+ <asp:ContentPlaceHolder ID="TitleContent" runat="server" />
+ </title>
+ <link href="/Content/Site.css" rel="stylesheet" type="text/css" />
+ <link href="/Content/SiteMaster.css" rel="stylesheet" type="text/css" />
+ <link href="/Scripts/jquery-ui-1.7.2.custom.css" rel="stylesheet" type="text/css" />
+ <script src="/Scripts/jquery-1.3.2.min.js" type="text/javascript"></script>
+ <script src="/Scripts/jquery-ui-1.7.2.custom.min.js" type="text/javascript"></script>
</head>
-
<body>
- <div class="page">
-
- <div id="header">
- <div id="title">
- <h1>My MVC Application</h1>
+ <div id="main">
+ <div id="head">
+ <div class="content">
+ <div class="clear">
+ <div id="logo">
+ <a href="/Default.aspx">
+ <img src="../../Content/images/logo.png" alt="Cronos Control time tracker open source project" /></a></div>
+ <div id="menu">
+ <ul class="menuitems">
+ <!-- menu items -->
+ <li>
+ <%= Html.ActionLink("Home", "Index", "Home")%></li>
+ <li>
+ <%= Html.ActionLink("Projects", "Index", "Projects")%></li>
+ <!-- end menu items -->
+ </ul>
+ </div>
+ </div>
</div>
-
- <div id="logindisplay">
- <% Html.RenderPartial("LogOnUserControl"); %>
- </div>
-
- <div id="menucontainer">
-
- <ul id="menu">
- <li><%= Html.ActionLink("Home", "Index", "Home")%></li>
- <li><%= Html.ActionLink("About", "About", "Home")%></li>
- </ul>
-
+ </div>
+ <div id="body">
+ <div class="content clear">
+ <!-- content -->
+ <asp:ContentPlaceHolder ID="MainContent" runat="server" />
+ <!-- end content -->
</div>
</div>
-
- <div id="main">
- <asp:ContentPlaceHolder ID="MainContent" runat="server" />
-
- <div id="footer">
+ <div id="footer">
+ <div class="content clear">
+ <div class="left">
+ <!-- footer - left -->
+ Cronos Control v0.0
+ <!-- end footer - left -->
+ </div>
+ <div class="right">
+ <!-- footer - right -->
+ <%= Html.ActionLink("Home", "Index", "Home")%>
+ <!-- end footer - right -->
+ </div>
</div>
</div>
</div>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
