Commit 1ed87ee4 authored by Dmitry Shelepnev's avatar Dmitry Shelepnev
Browse files

new body formatting

parent e228c5f6

assets/sopds-sass/scss/_settings.scss

+6 −5
Original line number Diff line number Diff line
@@ -51,7 +51,8 @@ $sopds-hover-color: scale-color($sopds-title-color, $lightness: -40%); 


$sopds-menu-bg-color: #f15a23;

$sopds-menu-color: #FFFFFF;

$sopds-menu-bg-hover-color: scale-color($sopds-menu-bg-color, $lightness: -20%);

$sopds-menu-bg-hover-color: scale-color($sopds-menu-bg-color, $lightness: -15%);

$sopds-menu-bg-active-color: scale-color($sopds-menu-bg-color, $lightness: -20%);

$sopds-menu-hover-color: scale-color($sopds-menu-color, $lightness: -15%);



// 1. Global
@@ -376,7 +377,7 @@ $input-radius: $global-radius; 
$label-background: $primary-color;

$label-color: foreground($label-background);

$label-font-size: 0.8rem;

$label-padding: 0.33333rem 0.5rem;

$label-padding: 0.2rem 0.2rem;

$label-radius: $global-radius;



// 21. Media Object
@@ -391,11 +392,11 @@ $mediaobject-image-width-stacked: 100%; 


$menu-margin: 0;

$menu-margin-nested: 1rem;

$menu-item-padding: 0.5rem 1rem;

$menu-item-padding: 0.5rem 0.5rem;

//$menu-item-padding: 0.25rem 1rem;

$menu-item-color-active: $white;

//$menu-item-background-active: map-get($foundation-palette, primary);

$menu-item-background-active: $sopds-menu-bg-hover-color;

$menu-item-background-active: $sopds-menu-bg-active-color;

$menu-icon-spacing: 0.25rem;



// 23. Meter
@@ -509,7 +510,7 @@ $switch-paddle-transition: all 0.25s ease-out; 


$table-background: $white;

$table-color-scale: 5%;

$table-border: 1px solid smart-scale($table-background, $table-color-scale);

$table-border: 0px solid smart-scale($table-background, $table-color-scale);

$table-padding: rem-calc(8 10 10);

$table-hover-scale: 2%;

$table-row-hover: darken($table-background, $table-hover-scale);

assets/sopds-sass/scss/sopds.scss

+1 −1
Original line number Diff line number Diff line
@@ -68,6 +68,6 @@ 
.sopdsmenu {

  background-color: $sopds-menu-bg-color;

  a { color : $sopds-menu-color; }

  a:hover { color: $sopds-menu-hover-color; } 

  a:hover { background-color: $sopds-menu-bg-hover-color; } 

  color : $sopds-menu-color;

}

sopds_web_backend/static/css/sopds.css

+1 −1

File changed.

Preview size limit exceeded, changes collapsed.

sopds_web_backend/templates/sopds_body.html

+19 −17
Original line number Diff line number Diff line
@@ -2,18 +2,19 @@ 


{% block body %}

{%  for b in books %}

	<div class="acq_entry">

		<div class="acq_link">

			<h2><b>{{ b.title }}</b></h2> <i>Скачать в формате: </i>

			<i><a href="{% url 'opds_catalog:download' b.id 0 %}"><span class="label">fb2</span></a></i>&nbsp;

			<i><a href="{% url 'opds_catalog:download' b.id 1 %}"><span class="label">fb2+zip</span></a></i>&nbsp;

		<div class="large-12 column">

			<b>{{ b.title }}</b>

			<i style="font-size:80%;">Скачать: </i>

			<i><a href="{% url 'opds_catalog:download' b.id 0 %}"><span class="label small">fb2</span></a></i>&nbsp;

			<i><a href="{% url 'opds_catalog:download' b.id 1 %}"><span class="label small">fb2+zip</span></a></i>&nbsp;

		</div>

		

		<div class="acq_info_container">		

			<div class=acq_cover>

			     <img src="{% url 'opds_catalog:cover' b.id %}" type="image/jpeg" width="80">

			</div>

			<div class=acq_infobook>

		<div class="large-12 column">	

		    <table><tr>	

		    <td width="100px" style="padding:0rem 0rem;">

			     <img src="{% url 'opds_catalog:cover' b.id %}" type="image/jpeg" width="80px">

			</td>

			<td style="font-size:80%; padding:1rem 1rem;">

				<b>Название книги:</b> {{ b.title }} <br>

				<b>Авторы:</b> <a href="sopds.wsgi?id=228322">Картер Лин, </a><a href="sopds.wsgi?id=2239535">де Камп Лион, </a><br>

				<b>Жанры:</b> <a href="sopds.wsgi?id=24197">Героическая фантастика</a>, <br>
@@ -22,12 +23,13 @@ 
				<b>Размер файла:</b> {{ b.filesize }}Кб.<br>

				<b>Дата правки:</b> {{ b.docdate }} <br>	

				<b>Дубликаты книги: </b> <a href="sopds.wsgi?id=23192960"> {{ b.title }} (1шт.)</a>

			</div>

		</div>	

		

		<div class="acq_annotation">

		    <p class="acq_annotation"> {{ b.annotation }} </p>			

		</div>		

			</td>

			</tr>

			<tr>

			<td colspan="2">

			    <p style="font-size:80%;"> {{ b.annotation }} </p>

			</td>

			</tr></table>

		</div>			

{% endfor %}

sopds_web_backend/templates/sopds_main.html

+1 −19
Original line number Diff line number Diff line
@@ -8,24 +8,6 @@ 
    <title>{{ app_title }}</title>

    <link rel="stylesheet" type="text/css" href="{% static "css/sopds.css" %}">

    <link rel="stylesheet" type="text/css" href="{% static "foundation-icons/foundation-icons.css" %}">   

   <style>

       .navigation_entry  { padding: 0 20px 0 20px; line-height:0; }

       .navigation_entry h2 { display: inline-block; }

       .acq_entry { padding: 0 20px 0 20px; font-family: Tahoma, Geneva, sans-serif; font-size: 8pt; color: #000;}

       .acq_entry a {color: #0F3253;}

       .acq_entry h1 {font-size: 130%; margin-bottom: 10px; }

       .acq_entry h2 {font-size: 120%; }

       .acq_entry h2 a { color: #000; }      

       .acq_link { clear: both; }

       .acq_link h2 { display: inline-block; }

       .acq_cover { float: left; width: 100px; }

       .acq_infobook  { float: left; width: 600px; }

       .acq_annotation { font-size: 90%%; }

       div.acq_annotation { clear: both; padding: 10px 0 10px 0;}

       .acq_info_container { clear: both; }

       .acq_rel { clear: both; }

       .page_control { text-align:center; }

    </style>    

</head>



<body>