Skip to content

Commit

Permalink
removed pop from mods. added mods back to core
Browse files Browse the repository at this point in the history
  • Loading branch information
@kikito
kikito committed Nov 22, 2011
1 parent cc5d761 commit ab631f1
Show file tree
Hide file tree
Showing 5 changed files with 15 additions and 75 deletions.
2 changes: 0 additions & 2 deletions core/core.css
View file
Expand Up @@ -9,7 +9,6 @@


@import url("module/mod.css");
/*@import url("module/mod_skins.css");*/
/*@import url("module/mod_debug.css");*/

@import url("media/media.css");
Expand All @@ -20,5 +19,4 @@
@import url("spacing/space.css");

@import url("table/table.css");
/*@import url("table/table_skins.css");*/
/*@import url("table/table_debug.css");*/
2 changes: 1 addition & 1 deletion core/grid/grids.css
View file
Expand Up @@ -11,4 +11,4 @@
.size2of5{width:40%;}
.size3of5{width:60%;}
.size4of5{width:80%;}
.lastUnit{float:none;width:auto;_position:relative;_left:-3px;_margin-right:-3px;}
.lastUnit{float:none;width:auto;_position:relative;_left:-3px;_margin-right:-3px;}
6 changes: 0 additions & 6 deletions core/module/mod.css
View file
Expand Up @@ -25,9 +25,3 @@ b.top, b.top b, b.bottom, b.bottom b{display:block;background-repeat:no-repeat;f
.complex .bl, .complex .br{/*margin-top:0;*/}
.complex .top{height:5px;}
.complex .bottom{height:5px;/*margin-top:-10px;*/}
/* pop */
.pop{overflow:visible;margin: 10px 20px 20px 10px; background-position:left top;}
.pop .inner{right:-10px; bottom:-10px; background-position:right bottom;padding:0 10px 10px 0;}
.pop .tl, .pop .br{display:none;}
.pop .bl{bottom:-10px;}
.pop .tr{float:right;margin-right:-10px;_display:inline; /*fix double margin bug*/ }
74 changes: 14 additions & 60 deletions core/module/mod_doc.html
View file
Expand Up @@ -4,6 +4,7 @@
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
<title>Standard Module Format</title>
<link rel="stylesheet" type="text/css" media="all" href="../../all.css" />
<link rel="stylesheet" type="text/css" media="all" href="mod_skins.css" />
<!--<link rel="stylesheet" type="text/css" media="all" href="mod_debug.css" />-->
<style type="text/css">
.posAbsolute{position:absolute;background-color:red;}
Expand All @@ -15,9 +16,9 @@

<h1>Modules</h1>
<h2>Block Structures</h2>
<p>There are three basic block structures that you can build from. Examine how the structures work in Firebug, Dragonfly, WebKit Inspector or by applying the stylesheet mod_debug.css</p>
<p>There are two basic block structures that you can build from. Examine how the structures work in Firebug, Dragonfly, WebKit Inspector or by applying the stylesheet mod_debug.css</p>
<div class="line">
<div class="unit size1of3">
<div class="unit size1of2">
<div class="mod">
<b class="top"><b class="tl"></b><b class="tr"></b></b>
<div class="inner">
Expand All @@ -37,7 +38,7 @@ <h3>mod </h3>
<b class="bottom"><b class="bl"></b><b class="br"></b></b>
</div>
</div>
<div class="unit size1of3">
<div class="unit size1of2 lastUnit">
<div class="mod complex">
<b class="top"><b class="tl"></b><b class="tr"></b></b>
<div class="inner">
Expand All @@ -58,32 +59,11 @@ <h3>complex</h3>
<b class="bottom"><b class="bl"></b><b class="br"></b></b>
</div>
</div>
<div class="unit size1of3 lastUnit">
<div class="mod pop">
<b class="top"><b class="tl"></b><b class="tr"></b></b>
<div class="inner">
<div class="hd">
<h3>pop </h3>
</div>
<div class="bd">
<p>Use for popups and other containers that need outside transparency.</p>
<ul class="simpleList">
<li>One image</li>
<li>Height and width limited by image size</li>
<li>Compatible with any container, but not any content</li>
<li>Choose when you require outside transparency which cannot be simulated. (do i need to make this work with clip rather than bkg position?)</li>
</ul>
<p>Inspired by <a href="http://www.lesliesommer.com/wdw07/html/" title="CSS Mojo: Adding Polish To Your Pages">Leslie Sommer’s Mojo blocks</a>.</p>
</div>
</div>
<b class="bottom"><b class="bl"></b><b class="br"></b></b>
</div>
</div>
</div>
<h2>Block Skins</h2>
<h3>Contour</h3>
<div class="line">
<div class=" unit size1of3">
<div class="unit size1of2">
<h4>Extends mod</h4>
<div class="mod grab">
<b class="top"><b class="tl"></b><b class="tr"></b></b>
Expand Down Expand Up @@ -170,8 +150,8 @@ <h3>basic</h3>
</div>
<b class="bottom"><b class="bl"></b><b class="br"></b></b>
</div>
</div>
<div class=" unit size1of3">
</div>
<div class="unit size1of2 lastUnit">
<h4>Extends complex</h4>
<div class="mod complex excerpt">
<b class="top"><b class="tl"></b><b class="tr"></b></b>
Expand Down Expand Up @@ -200,7 +180,7 @@ <h3>flow</h3>
</div>
<b class="bottom"><b class="bl"></b><b class="br"></b></b>
</div>
<!--<div class="mod boo">
<div class="mod boo">
<b class="top"><b class="tl"></b><b class="tr"></b></b>
<div class="inner">
<div class="hd">
Expand All @@ -211,39 +191,12 @@ <h3>flow</h3>
</div>
</div>
<b class="bottom"><b class="bl"></b><b class="br"></b></b>
</div>-->
<div class="mod complex photo">
<b class="top"><b class="tl"></b><b class="tr"></b></b>
<div class="inner">
<div class="bd">
<img src="http://placehold.it/269x179" alt="boo" />
</div>
</div>
<b class="bottom"><b class="bl"></b><b class="br"></b></b>
</div>
</div>
<div class=" unit size1of3 lastUnit">
<h4>Extends pop</h4>
<div class="mod pop sommers">
<b class="top"><b class="tl"></b><b class="tr"></b></b>
<div class="inner">
<div class="hd">
<h3>sommers</h3>
</div>
<div class="bd">
<p>Body</p>
</div>
</div>
<b class="bottom"><b class="bl"></b><b class="br"></b></b>
</div>
<div class="mod pop gonzalo">
<div class="mod complex photo">
<b class="top"><b class="tl"></b><b class="tr"></b></b>
<div class="inner">
<div class="hd gonz">
<h3>gonzalo</h3>
</div>
<div class="bd">
<p>Body</p>
<img src="http://placehold.it/427x179" alt="boo" />
</div>
</div>
<b class="bottom"><b class="bl"></b><b class="br"></b></b>
Expand All @@ -252,7 +205,7 @@ <h3>gonzalo</h3>
</div>
<h2>Background Objects</h2>
<div class="line">
<div class="unit size1of3">
<div class="unit size1of2">
<div class="mod highlight">
<b class="top"><b class="tl"></b><b class="tr"></b></b>
<div class="inner">
Expand All @@ -278,7 +231,8 @@ <h3>universe</h3>
<b class="bottom"><b class="bl"></b><b class="br"></b></b>
</div>
</div>
<div class="unit size1of3">
<div class="unit size1of2"></div>
<div class="unit size1of2">
<div class="mod comment">
<b class="top"><b class="tl"></b><b class="tr"></b></b>
<div class="inner">
Expand All @@ -304,7 +258,7 @@ <h3>foo</h3>
<b class="bottom"><b class="bl"></b><b class="br"></b></b>
</div>
</div>
<div class="unit size1of3 lastUnit">
<div class="unit size1of2 lastUnit">
<div class="mod nicole">
<b class="top"><b class="tl"></b><b class="tr"></b></b>
<div class="inner">
Expand Down
6 changes: 0 additions & 6 deletions core/module/mod_skins.css
View file
Expand Up @@ -76,12 +76,6 @@
.excerpt .top{height:1px;}
.excerpt .bottom{height:6px;margin-top:-6px;}/* margin top equal to - height of bottom */
.excerpt .br,.excerpt .bl{height:12px;margin-top:-6px;}/* margin top = bottom height - corner height */
/* ----- sommers (extends pop) ----- */
.sommers .inner{_border:3px solid #D7D7D7;}/*IE6 backup no alpha transparency */
.sommers,.sommers .inner,.sommers b{background-image:url(skin/glow_7px.png);_background-image:none;}
.sommers{margin:3px 20px 20px 3px;}
/* ----- gonzalo ----- */
.gonzalo, .gonzalo .inner, .gonzalo b{background-image:url(skin/gc.png);}
/* ====== Background blocks ====== */
.sale .inner{background:red none;}
.nicole .inner{background:#c01c41 none; color:#fff;}
Expand Down

0 comments on commit ab631f1

Please sign in to comment.