diff --git a/css/islandora.base.css b/css/islandora.base.css index 13dd8637..0a8b3662 100644 --- a/css/islandora.base.css +++ b/css/islandora.base.css @@ -5,4 +5,56 @@ Purpose of the stylesheet follows. */ +.islandora img { + max-width: 100%; + *width: 100%; +} +.islandora * { + -moz-box-sizing: border-box; + -webkit-box-sizing: border-box; + box-sizing: border-box; +} + +/* + * These rules will display DTs/DDs as columns. + * Constructs must follow a key/value pair pattern. + * The three last declarations are meant to kill white space between DTs/DDs + * (result of inline-block styling) + */ + +dl.islandora-inline-metadata { + margin: 0 auto; + letter-spacing: -0.31em; + *letter-spacing:normal; + word-spacing: -0.43em; +} + +.islandora-inline-metadata dt { + margin-right: -1px; + width: 15.625%; + font-weight: normal; + font-weight: bold; + padding-right: 0; +} + +.islandora-inline-metadata dd { + width: 84.375%; + padding-left: 40px; +} + +/* + * In this rule, we reset the white-space (see hack above) + */ +.islandora-inline-metadata dt, +.islandora-inline-metadata dd { + display: inline-block; + *display: inline; + zoom: 1; + letter-spacing: normal; + word-spacing: normal; + vertical-align: top; + padding-top: 6px; + padding-bottom: 4px; + margin: 0; +} diff --git a/css/islandora.theme.css b/css/islandora.theme.css index ad0ae79d..e299b9db 100644 --- a/css/islandora.theme.css +++ b/css/islandora.theme.css @@ -9,71 +9,27 @@ * Thumbnails float optionally to the left or right of descriptive lists. */ -.islandora-object-thumb img { - max-width: 100%; - *width: 100%; -} - -dl.islandora-object-thumb { +dl.islandora-object-tn { float: left; - width: 15%; - margin: 0.75em auto; -} - -.islandora-object-thumb dt, -.islandora-object-thumb dd { + width: 20.8333%; + padding: 0 10px 0 0; margin: 0; } -/* - * These rules will display DTs/DDs as columns. - * Constructs must follow a key/value pair pattern. - * The three last declarations are meant to kill white space between DTs/DDs - * (result of inline-block styling) - */ dl.islandora-object-fields { float: right; - width:83%; - margin: 0.75em auto; - letter-spacing:-0.34em; - *letter-spacing:normal; - word-spacing:-0.44em; + width:79.1666%; border-top:3px solid #ddd; -} +} -/* - * The width + left/right padding of DTs/DDs equals 88% when compensating for an image - */ .islandora-object-fields dt { - margin-right:-1px; - width:22.5%; font-weight: bold; } -.islandora-object-fields dd { - width:67%; -} - -/* - * In this rule, we reset the white-space (see hack above) - */ .islandora-object-fields dt, .islandora-object-fields dd { - display:inline-block; - *display:inline; - zoom:1; - letter-spacing:normal; - word-spacing:normal; - vertical-align:top; padding:6px 2% 4px; - margin:0; border-top:1px solid #ddd; - -ms-word-break: break-all; - word-break: break-all; - word-break: break-word; /* webkit */ --webkit-hyphens: auto; - -moz-hyphens: auto; - hyphens: auto; } .islandora-object-fields dt.first, diff --git a/islandora-object.tpl.php b/islandora-object.tpl.php index ca7a67ed..06b11cab 100644 --- a/islandora-object.tpl.php +++ b/islandora-object.tpl.php @@ -69,25 +69,25 @@ drupal_set_title($islandora_object->label); // } ?> -
+

Details

-
+
'); ?>
-
- - $value): ?> -
- -
-
- -
- - -
+
diff --git a/islandora_basic_image/css/islandora_basic_image.theme.css b/islandora_basic_image/css/islandora_basic_image.theme.css index 1c74b737..e7b31c4d 100644 --- a/islandora_basic_image/css/islandora_basic_image.theme.css +++ b/islandora_basic_image/css/islandora_basic_image.theme.css @@ -5,12 +5,6 @@ Purpose of the stylesheet follows. */ -.islandora-basic-image-object img { - height: auto; - max-width: 100%; - *width: 100%; -} - .islandora-basic-image-content, .islandora-basic-image-sidebar { display: inline; @@ -19,30 +13,14 @@ .islandora-basic-image-metadata { display: block; - clear: both + clear: both; } dl.islandora-basic-image-fields { width:100%; - margin: 0 auto; - letter-spacing:-0.31em; - *letter-spacing:normal; - word-spacing:-0.43em; -} - -/* - * The width + left/right padding of DTs/DDs equals 88% when compensating for an image - */ - -.islandora-basic-image-metadata * { - -moz-box-sizing: border-box; - -webkit-box-sizing: border-box; - box-sizing: border-box; } .islandora-basic-image-metadata dt { - margin-right:-1px; - width:15.625%; font-weight: normal; text-align: right; font-weight: bold; @@ -50,24 +28,12 @@ dl.islandora-basic-image-fields { } .islandora-basic-image-metadata dd { - width:84.375%; padding-left: 40px; } -/* - * In this rule, we reset the white-space (see hack above) - */ + .islandora-basic-image-metadata dt, .islandora-basic-image-metadata dd { - display:inline-block; - *display:inline; - zoom:1; - letter-spacing:normal; - word-spacing:normal; - vertical-align:top; - padding-top: 6px; - padding-bottom: 4px; - margin:0; border-top:1px solid #e5e5e5; } @@ -84,22 +50,8 @@ body.two-sidebars .islandora-basic-image-sidebar { width: 100%; } -.islandora-basic-image-sidebar, -.islandora-basic-image-sidebar, -body.one-sidebar .islandora-basic-image-sidebar, -body.two-sidebars .islandora-basic-image-sidebar { - width: 100%; -} - @media all and (min-width: 768px) { - body.no-sidebars .islandora-basic-image-content, - body.no-sidebars .islandora-basic-image-sidebar { - -moz-box-sizing: border-box; - -webkit-box-sizing: border-box; - box-sizing: border-box; - } - body.no-sidebars .islandora-basic-image-content { width: 60%; padding: 0 20px 0 0; diff --git a/islandora_basic_image/islandora-basic-image.tpl.php b/islandora_basic_image/islandora-basic-image.tpl.php index 596a5233..a1a61da5 100644 --- a/islandora_basic_image/islandora-basic-image.tpl.php +++ b/islandora_basic_image/islandora-basic-image.tpl.php @@ -23,7 +23,7 @@ ?> -
+
@@ -36,7 +36,7 @@