Commit e4f22efbfd361098a2d0674406bc79bce1c72c48

Authored by Daniela Feitosa
2 parents 9b5026be ed4de6bb

Merge remote branch 'unb-gama/AI2810-box_organizer'

Showing 1 changed file with 66 additions and 25 deletions   Show diff stats
public/stylesheets/application.css
@@ -1603,7 +1603,7 @@ a.button.disabled, input.disabled { @@ -1603,7 +1603,7 @@ a.button.disabled, input.disabled {
1603 } 1603 }
1604 1604
1605 /*********************************************************** 1605 /***********************************************************
1606 - * style for blocks 1606 + * style for blocks
1607 ***********************************************************/ 1607 ***********************************************************/
1608 1608
1609 #content .communities-block .profile-image { 1609 #content .communities-block .profile-image {
@@ -1667,23 +1667,21 @@ a.button.disabled, input.disabled { @@ -1667,23 +1667,21 @@ a.button.disabled, input.disabled {
1667 ************************************************/ 1667 ************************************************/
1668 1668
1669 .block-target { 1669 .block-target {
1670 - margin: 5px;  
1671 - height: 2px;  
1672 - height: 15px;  
1673 - border: 1px dashed #e0e0e0; 1670 + padding: 2px;
  1671 + background: #ffd;
  1672 + margin-bottom: 5px;
1674 } 1673 }
1675 .block-target-hover { 1674 .block-target-hover {
1676 background: #ffd; 1675 background: #ffd;
1677 - border: 1px solid red; 1676 + border: 1px solid #000;
1678 height: 30px; 1677 height: 30px;
  1678 + box-shadow: 0 0 15px #888 inset;
1679 } 1679 }
1680 /************************************************************* 1680 /*************************************************************
1681 * put borders around boxes and blocks when organizing boxes * 1681 * put borders around boxes and blocks when organizing boxes *
1682 *************************************************************/ 1682 *************************************************************/
1683 1683
1684 #box-organizer div.box { 1684 #box-organizer div.box {
1685 - border: 1px solid #ccc;  
1686 - background-color: white;  
1687 background-repeat: no-repeat; 1685 background-repeat: no-repeat;
1688 background-position: top right; 1686 background-position: top right;
1689 } 1687 }
@@ -1696,28 +1694,72 @@ a.button.disabled, input.disabled { @@ -1696,28 +1694,72 @@ a.button.disabled, input.disabled {
1696 #box-organizer div.box-3 { 1694 #box-organizer div.box-3 {
1697 background-image: url(../images/blocks/3.png); 1695 background-image: url(../images/blocks/3.png);
1698 } 1696 }
1699 -#box-organizer div.box-1 .block {  
1700 - outline: 2px dashed green; 1697 +#box-organizer .block {
  1698 + cursor: move;
  1699 +}
  1700 +#box-organizer .block:hover {
  1701 + box-shadow: 0px 0px 0px 2px #FFF,
  1702 + 0px 0px 0px 2px #FFF,
  1703 + 0px 0px 10px rgba(0, 0, 0, 0.6);
  1704 + outline: none;
1701 } 1705 }
  1706 +#box-organizer .block {
  1707 + cursor: move;
  1708 + position: relative;
  1709 + min-height: 20px;
  1710 +}
  1711 +
  1712 +#box-organizer .block .button-bar {
  1713 + cursor: move;
  1714 + position: absolute;
  1715 + display: block;
  1716 + width: 100%;
  1717 + height: 100%;
  1718 + background: rgba(255, 255, 255, 0.3);
  1719 + top: -40px;
  1720 + padding-bottom: 40px;
  1721 + display: none;
  1722 +}
  1723 +
  1724 +#box-organizer .block:focus .button-bar,
  1725 +#box-organizer .block:hover .button-bar {
  1726 + display: block;
  1727 +}
  1728 +
1702 .msie #box-organizer div.box-1 .block { 1729 .msie #box-organizer div.box-1 .block {
1703 border: 2px dashed green; 1730 border: 2px dashed green;
1704 } 1731 }
1705 -#box-organizer div.box-2 .block {  
1706 - outline: 2px dashed red;  
1707 -}  
1708 .msie #box-organizer div.box-1 .block { 1732 .msie #box-organizer div.box-1 .block {
1709 border: 2px dashed red; 1733 border: 2px dashed red;
1710 } 1734 }
1711 -#box-organizer div.box-3 .block {  
1712 - outline: 2px dashed blue;  
1713 -}  
1714 .msie #box-organizer div.box-1 .block { 1735 .msie #box-organizer div.box-1 .block {
1715 border: 2px dashed blue; 1736 border: 2px dashed blue;
1716 } 1737 }
1717 -.block-footer-content {  
1718 - clear: both;  
1719 - margin-top: 1em; 1738 +/************************************************************
  1739 + * custom interation blocks on drag n drop *
  1740 + ***********************************************************/
  1741 +#box-organizer .main-block {
  1742 + font-size: 24px;
1720 text-align: center; 1743 text-align: center;
  1744 + box-shadow: none;
  1745 + outline: none;
  1746 + display: block;
  1747 + height: 150px;
  1748 + line-height: 120px;
  1749 +}
  1750 +#box-organizer .main-block:hover {
  1751 + border: 0px;
  1752 + border-style: none;
  1753 + box-shadow: none;
  1754 + outline: none;
  1755 +}
  1756 +/* FIX Error show option buttons on blocks */
  1757 +#box-organizer .block {
  1758 + overflow: visible !important;
  1759 +}
  1760 +
  1761 +#box-organizer .blog-post {
  1762 + margin: auto;
1721 } 1763 }
1722 1764
1723 /**************************************** 1765 /****************************************
@@ -1765,7 +1807,7 @@ a.button.disabled, input.disabled { @@ -1765,7 +1807,7 @@ a.button.disabled, input.disabled {
1765 margin: 3px 0; 1807 margin: 3px 0;
1766 } 1808 }
1767 1809
1768 -/* ==> blocks/tags-block.css <<= */ 1810 +/* ==> blocks/tags-block.css <<= */
1769 1811
1770 .tags-block { 1812 .tags-block {
1771 } 1813 }
@@ -1776,7 +1818,7 @@ a.button.disabled, input.disabled { @@ -1776,7 +1818,7 @@ a.button.disabled, input.disabled {
1776 .tags-block .tag_cloud a:hover { 1818 .tags-block .tag_cloud a:hover {
1777 color: red; 1819 color: red;
1778 } 1820 }
1779 -/* ==> blocks/my-network-block.css <<= */ 1821 +/* ==> blocks/my-network-block.css <<= */
1780 1822
1781 #content .my-network-block { 1823 #content .my-network-block {
1782 padding: 10px 0px 10px 10px; 1824 padding: 10px 0px 10px 10px;
@@ -1784,7 +1826,7 @@ a.button.disabled, input.disabled { @@ -1784,7 +1826,7 @@ a.button.disabled, input.disabled {
1784 .my-network-block a { 1826 .my-network-block a {
1785 text-decoration: none; 1827 text-decoration: none;
1786 } 1828 }
1787 -/* ==> blocks/link-list-block.css <<= */ 1829 +/* ==> blocks/link-list-block.css <<= */
1788 1830
1789 #edit-link-list-block table { 1831 #edit-link-list-block table {
1790 width: 100%; 1832 width: 100%;
@@ -1843,8 +1885,7 @@ a.button.disabled, input.disabled { @@ -1843,8 +1885,7 @@ a.button.disabled, input.disabled {
1843 border: 1px solid black; 1885 border: 1px solid black;
1844 background-color: #555; 1886 background-color: #555;
1845 } 1887 }
1846 -/* ==> blocks/profile-list-block.css <<= */  
1847 - 1888 +/* ==> blocks/profile-list-block.css <<= */
1848 1889
1849 #content .profile-list-block h3 { 1890 #content .profile-list-block h3 {
1850 text-align: center; 1891 text-align: center;
@@ -1983,7 +2024,7 @@ a.button.disabled, input.disabled { @@ -1983,7 +2024,7 @@ a.button.disabled, input.disabled {
1983 opacity: 0.5; 2024 opacity: 0.5;
1984 filter: alpha(opacity=50); 2025 filter: alpha(opacity=50);
1985 } 2026 }
1986 -/* ==> blocks/recent-documents-block.css <<= */ 2027 +/* ==> blocks/recent-documents-block.css <<= */
1987 2028
1988 #content .recent-documents-block { 2029 #content .recent-documents-block {
1989 padding: 10px 0px 10px 10px; 2030 padding: 10px 0px 10px 10px;