diff --git a/gemp-lotr/gemp-lotr-async/src/main/web/css/gemp-001/deckBuild.css b/gemp-lotr/gemp-lotr-async/src/main/web/css/gemp-001/deckBuild.css index 2222387fa..4af556fb0 100644 --- a/gemp-lotr/gemp-lotr-async/src/main/web/css/gemp-001/deckBuild.css +++ b/gemp-lotr/gemp-lotr-async/src/main/web/css/gemp-001/deckBuild.css @@ -39,6 +39,7 @@ body { #manageDecks { color: #ffffff; font-size: 180%; + display: flex; } #editingDeck { @@ -87,3 +88,40 @@ body { .menu-button > .ui-button-text { padding: 0; } + +button.navigation-butt { + padding: 0.5em; +} + +.navigation-butt.ui-button-icon-only > .ui-button-text{ + padding: 0; +} + +.navigation-butt.ui-button-icon-only { + width: 25px; +} + +.ui-button-icon-only .ui-button-icon-primary.ui-icon { + margin: auto auto auto -4px; +} + +#culture-buttons .ui-button { + padding: 0; +} + +#collectionSelect { + order: 100; +} + +#editingDeck { + flex-grow: 1; +} + +.notesText { + flex-grow: 1; + margin: 5px; +} + +.notesDialog { + display: flex; +} \ No newline at end of file diff --git a/gemp-lotr/gemp-lotr-async/src/main/web/css/gemp-001/hall.css b/gemp-lotr/gemp-lotr-async/src/main/web/css/gemp-001/hall.css index 5e750177f..a111c677a 100644 --- a/gemp-lotr/gemp-lotr-async/src/main/web/css/gemp-001/hall.css +++ b/gemp-lotr/gemp-lotr-async/src/main/web/css/gemp-001/hall.css @@ -346,12 +346,18 @@ table.tables tr.privateForPlayer { position:relative; width:100%; /*min-height: 30px;*/ - height: 500px; + height: 300px; grid-gap: 3px; overflow: hidden; background-color: #121212; - top: 0 !important; + /*top: 0 !important;*/ padding-top: 5px; + align-self: flex-end; + flex-shrink: 0; +} + +#chat[style] { + top: 0 !important; } .ui-resizable-handle { diff --git a/gemp-lotr/gemp-lotr-async/src/main/web/deckBuild.html b/gemp-lotr/gemp-lotr-async/src/main/web/deckBuild.html index 35ae0bafb..e758396e9 100644 --- a/gemp-lotr/gemp-lotr-async/src/main/web/deckBuild.html +++ b/gemp-lotr/gemp-lotr-async/src/main/web/deckBuild.html @@ -3,6 +3,11 @@ GEMP: LotR-TCG - Deckbuilder + + + + + @@ -54,7 +59,8 @@ onresize:function () { ui.layoutUI(true); }, - east__minSize:"30%" + east__minSize:350, + east__maxSize:"50%" }); $(".ui-layout-pane").css({"background-color":"#000000"}); @@ -68,26 +74,7 @@ @@ -158,8 +145,8 @@
-
-
+
+
"); - this.filterDiv.append("
" + ); + this.filterDiv.append("" + "" + "" + "" @@ -237,7 +240,7 @@ var CardFilter = Class.extend({ //+ "" //+ "" //+ "" - + "
"); + ); var combos = $("
"); @@ -365,10 +368,10 @@ var CardFilter = Class.extend({ + ""); this.filterDiv.append(combos); - elem.append(this.filterDiv); + this.pageDiv.append(this.filterDiv); + - $("#culture1").buttonset(); - $("#culture2").buttonset(); + $("#culture-buttons").buttonset(); var fullFilterChanged = function () { that.start = 0; @@ -437,18 +440,22 @@ var CardFilter = Class.extend({ //Additional Hobbit Draft labels $("#labelDWARVEN,#labelELVEN,#labelGANDALF,#labelGONDOR,#labelROHAN,#labelSHIRE,#labelGOLLUM,#labelDUNLAND,#labelISENGARD,#labelMEN,#labelMORIA,#labelORC,#labelRAIDER,#labelSAURON,#labelURUK_HAI,#labelWRAITH,#labelESGAROTH,#labelGUNDABAD").click(filterOut); + + this.collectionDiv = $("
"); + //collection-display + pageElem.append(this.collectionDiv); }, layoutUi: function (x, y, width, height) { - this.pageDiv.css({position: "absolute", left: x, top: y, width: width, height: 34}); - this.countSlider.css({width: width - 100}); - this.fullFilterDiv.css({position: "absolute", left: x, top: y + 34, width: width, height: 34}); - this.filterDiv.css({position: "absolute", left: x, top: y + 68, width: width, height: 80}); + //this.pageDiv.css({position: "absolute", left: x, top: y, width: width, height: 34}); + //this.countSlider.css({width: width - 100}); + //this.fullFilterDiv.css({position: "absolute", left: x, top: y + 34, width: width, height: 34}); + //this.filterDiv.css({position: "absolute", left: x, top: y + 68, width: width, height: 80}); }, layoutPageUi: function (x, y, width) { - this.pageDiv.css({left: x, top: y, width: width, height: 36}); - this.countSlider.css({width: width - 100}); + //this.pageDiv.css({left: x, top: y, width: width, height: 36}); + //this.countSlider.css({width: width - 100}); }, disableNavigation: function () { @@ -459,12 +466,7 @@ var CardFilter = Class.extend({ calculateNormalFilter: function () { var cultures = new Array(); - $("label", $("#culture1")).each( - function () { - if ($(this).hasClass("ui-state-active")) - cultures.push($(this).prop("id").substring(5)); - }); - $("label", $("#culture2")).each( + $("label", $("#culture-buttons")).each( function () { if ($(this).hasClass("ui-state-active")) cultures.push($(this).prop("id").substring(5)); diff --git a/gemp-lotr/gemp-lotr-async/src/main/web/js/gemp-022/deckBuildingUi.js b/gemp-lotr/gemp-lotr-async/src/main/web/js/gemp-022/deckBuildingUi.js index 429aac66e..3c639f29a 100644 --- a/gemp-lotr/gemp-lotr-async/src/main/web/js/gemp-022/deckBuildingUi.js +++ b/gemp-lotr/gemp-lotr-async/src/main/web/js/gemp-022/deckBuildingUi.js @@ -58,7 +58,7 @@ var GempLotrDeckBuildingUI = Class.extend({ this.comm = new GempLotrCommunication("/gemp-lotr-server", that.processError); - this.cardFilter = new CardFilter($("#collectionDiv"), $("#collectionDiv"), + this.cardFilter = new CardFilter($("#collectionDiv"), function (filter, start, count, callback) { if (!that.specialSelection) { filter = filter + " cardType:-THE_ONE_RING"; @@ -181,7 +181,7 @@ var GempLotrDeckBuildingUI = Class.extend({ that.cardFilter.getCollection(); }); - this.normalCollectionDiv = $("#cardCollectionDiv"); + this.normalCollectionDiv = $("#collection-display"); this.normalCollectionGroup = new NormalCardGroup(this.normalCollectionDiv, function (card) { return true; }); @@ -1137,7 +1137,7 @@ var GempLotrDeckBuildingUI = Class.extend({ this.bottomBarDiv.css({ position:"absolute", left:padding * 2 + sitesWidth, top:manageHeight + padding + deckHeight - 50, width:deckWidth - (sitesWidth + padding) - padding, height:70 }); this.cardFilter.layoutUi(padding, 0, collectionWidth - padding, 160); - this.normalCollectionDiv.css({ position:"absolute", left:padding, top:160, width:collectionWidth - padding * 2, height:collectionHeight - 160 }); + //this.normalCollectionDiv.css({ position:"absolute", left:padding, top:160, width:collectionWidth - padding * 2, height:collectionHeight - 160 }); this.normalCollectionGroup.setBounds(0, 0, collectionWidth - padding * 2, collectionHeight - 160); } else { diff --git a/gemp-lotr/gemp-lotr-async/src/main/web/js/gemp-022/hallUi.js b/gemp-lotr/gemp-lotr-async/src/main/web/js/gemp-022/hallUi.js index 3b36952dc..459dede27 100644 --- a/gemp-lotr/gemp-lotr-async/src/main/web/js/gemp-022/hallUi.js +++ b/gemp-lotr/gemp-lotr-async/src/main/web/js/gemp-022/hallUi.js @@ -25,8 +25,8 @@ var GempLotrHallUI = Class.extend({ $("#chat").resizable({ handles: "n", - minHeight: 150, - distance: 10 + minHeight: 100, + distance: 20 }); this.comm = new GempLotrCommunication(url, function (xhr, ajaxOptions, thrownError) { diff --git a/gemp-lotr/gemp-lotr-async/src/main/web/js/gemp-022/merchantUi.js b/gemp-lotr/gemp-lotr-async/src/main/web/js/gemp-022/merchantUi.js index 754a385ca..919437125 100644 --- a/gemp-lotr/gemp-lotr-async/src/main/web/js/gemp-022/merchantUi.js +++ b/gemp-lotr/gemp-lotr-async/src/main/web/js/gemp-022/merchantUi.js @@ -23,7 +23,7 @@ var GempLotrMerchantUI = Class.extend({ this.comm = new GempLotrCommunication("/gemp-lotr-server", that.processError); - this.cardFilter = new CardFilter(cardFilterElem, cardFilterElem, + this.cardFilter = new CardFilter(cardFilterElem, function (filter, start, count, callback) { that.comm.getMerchant(filter, that.ownedMin, start, count, callback); },